fix: preserve legacy official event export

Co-Authored-By: Codex <noreply@openai.com>

Author: Pigbibi

src/political_event_tracking_research/official_event_import.py

@@ -38,6 +38,22 @@
     {"issuer", "direct_beneficiary", "industry_context", "unverified"}
 )
 
+LEGACY_EVENT_COLUMNS = [
+    "event_id",
+    "event_date",
+    "symbol",
+    "event_type",
+    "direction",
+    "confidence",
+    "source_url",
+    "notes",
+]
+ENTITY_EVENT_COLUMNS = LEGACY_EVENT_COLUMNS + [
+    "entity_match_type",
+    "match_evidence",
+    "relationship_type",
+]
+
 
 @dataclass(frozen=True)
 class OfficialRecord:
@@ -148,24 +164,17 @@ def normalize_records(records: list[OfficialRecord]) -> list[dict[str, str]]:
     return rows
 
 
-def import_official_events(input_path: str | Path, output_path: str | Path) -> list[dict[str, str]]:
+def import_official_events(
+    input_path: str | Path,
+    output_path: str | Path,
+    *,
+    include_entity_metadata: bool = False,
+) -> list[dict[str, str]]:
     records = load_official_records(input_path)
     rows = normalize_records(records)
     write_csv_rows(
         output_path,
-        [
-            "event_id",
-            "event_date",
-            "symbol",
-            "event_type",
-            "direction",
-            "confidence",
-            "source_url",
-            "notes",
-            "entity_match_type",
-            "match_evidence",
-            "relationship_type",
-        ],
+        ENTITY_EVENT_COLUMNS if include_entity_metadata else LEGACY_EVENT_COLUMNS,
         rows,
     )
     return rows
@@ -177,12 +186,17 @@ def build_arg_parser() -> argparse.ArgumentParser:
     )
     parser.add_argument("--input", required=True, help="Official-source record CSV.")
     parser.add_argument("--output", required=True, help="Output normalized event CSV.")
+    parser.add_argument(
+        "--include-entity-metadata",
+        action="store_true",
+        help="Opt in to entity metadata columns in the normalized CSV.",
+    )
     return parser
 
 
 def main(argv: list[str] | None = None) -> None:
     args = build_arg_parser().parse_args(argv)
-    import_official_events(args.input, args.output)
+    import_official_events(args.input, args.output, include_entity_metadata=args.include_entity_metadata)
 
 
 if __name__ == "__main__":

tests/test_official_event_import.py

@@ -31,7 +31,7 @@ def test_import_official_events_normalizes_to_event_schema(tmp_path: Path) -> No
     assert rows[-1]["confidence"] == "low"
 
 
-def test_legacy_input_defaults_entity_schema_fields_and_serializes_stably(tmp_path: Path) -> None:
+def test_legacy_input_defaults_to_legacy_eight_column_serialization(tmp_path: Path) -> None:
     output = tmp_path / "events.csv"
 
     rows = import_official_events(ROOT / "examples/official_records.example.csv", output)
@@ -49,12 +49,43 @@ def test_legacy_input_defaults_entity_schema_fields_and_serializes_stably(tmp_pa
             "confidence",
             "source_url",
             "notes",
-            "entity_match_type",
-            "match_evidence",
-            "relationship_type",
         ]
 
 
+def test_entity_metadata_serialization_requires_explicit_opt_in(tmp_path: Path) -> None:
+    input_path = tmp_path / "official-records.csv"
+    output = tmp_path / "events.csv"
+    input_path.write_text(
+        "record_id,record_date,symbol,source_type,event_type,direction,source_url,summary,"
+        "entity_match_type,match_evidence,relationship_type\n"
+        "entity-record,2026-01-10,EVT,government_filing,disclosure_buy,bullish,"
+        "https://www.sec.gov/example/entity-record,Entity evidence.,direct_beneficiary,"
+        "Named beneficiary in filing.,supplier\n",
+        encoding="utf-8",
+    )
+
+    import_official_events(input_path, output, include_entity_metadata=True)
+
+    with output.open(newline="", encoding="utf-8") as handle:
+        rows = list(csv.DictReader(handle))
+    assert list(rows[0]) == [
+        "event_id",
+        "event_date",
+        "symbol",
+        "event_type",
+        "direction",
+        "confidence",
+        "source_url",
+        "notes",
+        "entity_match_type",
+        "match_evidence",
+        "relationship_type",
+    ]
+    assert rows[0]["entity_match_type"] == "direct_beneficiary"
+    assert rows[0]["match_evidence"] == "Named beneficiary in filing."
+    assert rows[0]["relationship_type"] == "supplier"
+
+
 def test_entity_schema_fields_are_imported_and_normalized() -> None:
     record = OfficialRecord(
         record_id="entity-record",