Merge remote-tracking branch 'origin/sprint-36/server'

# Conflicts:
#	server/data/systems.db

tooling/economy-db/import_economics.py

@@ -40,6 +40,7 @@ CHAINS_TOML = REPO_ROOT / "wiki" / "economics" / "production_chains.toml"
 SCHEMA_SQL = REPO_ROOT / "server" / "data" / "systems-schema.sql"
 CORPORATIONS_DIR = REPO_ROOT / "wiki" / "corporations"
 BRANDS_TOML = REPO_ROOT / "wiki" / "economics" / "corporations" / "brands.toml"
+GENERATED_BRANDS_TOML = REPO_ROOT / "wiki" / "economics" / "corporations" / "generated_brands.toml"
 
 
 class _ImportAborted(Exception):
@@ -748,22 +749,36 @@ VALID_CURRENCY_DENOMINATIONS = {"tractus", "mark", "mixed", "sol_adjacent"}
 VALID_PRICE_TIERS = {"mass", "premium", "luxury", "flagship", "institutional"}
 
 
+def _load_brand_file(path) -> tuple[list, list]:
+    """Load brand_products and brand_inputs from a TOML file. Returns empty lists if missing."""
+    if not path.exists():
+        return [], []
+    with open(path, "rb") as f:
+        data = tomllib.load(f)
+    return data.get("brand_products", []), data.get("brand_inputs", [])
+
+
 def import_brands(
     conn: sqlite3.Connection, dry_run: bool
 ) -> tuple[int, int]:
-    """Import brand_products and brand_inputs from wiki/economics/corporations/brands.toml.
+    """Import brand_products and brand_inputs from brands.toml and generated_brands.toml.
 
+    Hand-authored brands (brands.toml) are imported first; generated brands
+    (generated_brands.toml, produced by `tooling/generate-brands`) are merged in.
     Returns (n_products, n_inputs).
     """
     if not BRANDS_TOML.exists():
         print("        warning: brands.toml not found — brand layer skipped")
         return 0, 0
 
-    with open(BRANDS_TOML, "rb") as f:
-        data = tomllib.load(f)
+    products_authored, inputs_authored = _load_brand_file(BRANDS_TOML)
+    products_generated, inputs_generated = _load_brand_file(GENERATED_BRANDS_TOML)
 
-    products = data.get("brand_products", [])
-    inputs = data.get("brand_inputs", [])
+    if products_generated:
+        print(f"        merging {len(products_generated)} generated brand_products from generated_brands.toml")
+
+    products = products_authored + products_generated
+    inputs = inputs_authored + inputs_generated
 
     product_rows = []
     for p in products:

tooling/generate-brands

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+# Generate minor brand products for the Settled Reach economy.
+#
+# Usage:
+#   tooling/generate-brands
+#   tooling/generate-brands --seed 42 --min-brands 10000
+#   tooling/generate-brands --output wiki/economics/corporations/generated_brands.toml
+#
+# Builds on first run if binary doesn't exist.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
+BIN="$ROOT_DIR/server/target/debug/generate_brands"
+
+# Build if needed
+if [ ! -f "$BIN" ]; then
+    echo "Building generate_brands..." >&2
+    (cd "$ROOT_DIR/server" && cargo build --bin generate_brands 2>&1 | tail -3) >&2
+fi
+
+exec "$BIN" "$@"