refactor: post-Gate-6 remove general_* facades and legacy artifact readers

Delete graphfl_lab/general_* and cli/general_* shims; discovery and suite
helpers use vision_* names only (short suite_* aliases kept). Gitignore local
pre-rename artifact globs under experiment output trees.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: 2-mean

.gitignore

@@ -26,6 +26,10 @@ htmlcov/
 # Experiment outputs and generated analysis artifacts
 /experiments_current/
 /experiments/
+# Pre-rename artifact filenames (local trees only; current code uses vision_* names)
+**/result_general_*.json
+**/general_suite_summary.*
+**/general_suite_rows.json
 /outputs_current/
 /outputs/
 /runs/

MIGRATION.md

@@ -26,28 +26,27 @@ python run_experiment.py --track cora ...
 During deprecation, old names remain available where documented:
 
 ```text
-configs/general/...
-result_general_*   (readers only; new runs no longer write mirrors)
-general_suite_*    (readers only; new runs no longer write mirrors)
+configs/general/...   (path alias to configs/vision in config loader)
 spectral_filter_strength   (JSON config key alias only; CLI uses --graph-filter-strength)
 ```
 
-Root `run_general_*` and `plot_general_*` / `merge_general_*` /
-`deep_dive_general` script wrappers were removed in Gate 6 batch 3. Prefer
-`run_vision_*` and vision-named report/analysis scripts in new work.
+Gate 6 and post-Gate-6 cleanup removed `run_general_*`, `graphfl_lab/general_*`,
+`general_suite_*` / `result_general_*` code paths. Prefer `run_vision_*`,
+`result_vision_*`, and `vision_suite_*` in new work. Old artifact filenames
+under local experiment dirs are gitignored, not read by current code.
 
 ## Output Artifacts
 
-New vision runs write canonical filenames only (Gate 6 batch 2). Readers still
-resolve legacy paths for older experiment directories:
+New vision runs write canonical filenames only (Gate 6 batch 2). Suite helpers
+also accept short `suite_*` artifact names when present:
 
-| Canonical (new runs) | Legacy (read-only) |
+| Canonical (new runs) | Short legacy (read-only) |
 |---|---|
-| `result_vision_*.json` | `result_general_*.json` |
-| `vision_suite_summary.json` / `.csv` / `.md` | `general_suite_summary.*` |
-| `vision_suite_rows.json` | `general_suite_rows.json` |
+| `result_vision_*.json` | — |
+| `vision_suite_summary.json` / `.csv` / `.md` | `suite_summary.*` |
+| `vision_suite_rows.json` | `suite_rows.json` |
 
-Readers and suite helpers resolve either family, preferring canonical paths when
+Readers and suite helpers prefer canonical paths when
 both exist. See `graphfl_lab/experiments/suites/vision/artifacts.py` and
 `variant_helpers.resolve_result_path_for_variant`.
 
@@ -69,8 +68,6 @@ scripts/analysis/deep_dive_vision.py
 scripts/analysis/merge_vision_fedavg_ours.py
 ```
 
-Legacy `*_general_*` script names remain as thin wrappers until Gate 6.
-
 ## Schema Fields
 
 New results will eventually include:

README.md

@@ -308,7 +308,7 @@ python scripts/checks/prior_work_proxy_parity.py --summary experiments_current/p
 
 ## Reporting And Analysis
 
-Canonical report commands (compatibility wrappers keep the `general_*` names):
+Canonical report commands:
 
 ```powershell
 python scripts/reports/plot_vision_convergence.py --suite-dir experiments_current/<suite_tag>
@@ -317,8 +317,9 @@ python scripts/analysis/deep_dive_vision.py --suite-dir ... --suite-tag ... --va
 python scripts/analysis/merge_vision_fedavg_ours.py --help
 ```
 
-Suite outputs prefer `vision_suite_*` and `result_vision_*` filenames. Readers also
-accept historical `general_suite_*` and `result_general_*` artifacts until Gate 6.
+Suite outputs use `vision_suite_*` and `result_vision_*` filenames. Short `suite_*`
+aliases are still read when present. Pre-rename `general_*` / `result_general_*`
+files in local experiment trees are gitignored and not loaded by current code.
 
 ## Compatibility
 
@@ -327,9 +328,6 @@ New code uses `vision`, `graphfl`, `graph_filtered_*`.
 | Old name | Role |
 |---|---|
 | `spectral_filter_strength` | JSON config key alias via `config_io` (CLI flag is `--graph-filter-strength`) |
-| `general_suite_*`, `result_general_*` | historical output filenames (readers only; new runs use vision names) |
-
-Do not add new logic to compatibility paths.
 
 ## Git Policy
 

docs/maintenance/cleanup-status.md

@@ -17,7 +17,7 @@ truth for code; long-term removal notes and tombstones live in
 | started_at | 2026-05-21 |
 | closed_at | 2026-05-22 |
 | last_verified | `docs/maintenance/last_gate_check.json` (5d-prep pass after batch 7) |
-| next_step | none for Gate 6; optional post-Gate-6 debt: `graphfl_lab/general_*` CLI facades (see `removed-materials.md`) |
+| next_step | none — Gate 6 + post-Gate-6 `general_*` facade removal complete (see `removed-materials.md`) |
 
 Only one Gate branch should be active at a time. In short: use a single Gate branch.
 If parallel work is
@@ -279,6 +279,7 @@ result-schema contracts.
 | 2026-05-22 | Gate 6 batch 7 pre-check: no `configs/**` files use `ours_spectral_filtered_*` or `spectral_filtered_*`; reporting still pairs legacy result variant tags via `reporting.py` prefixes. | Remove CLI `choices`/dual flags and suite `parse_target_variant` spectral branch; keep `config_io` JSON key alias, lifecycle/strategy input aliases, and report readers. |
 | 2026-05-22 | Gate 6 batch 7: public CLI listed `spectral_filtered_*` choices and dual `--spectral-filter-strength`; suite parser accepted `ours_spectral_filtered_*` launch tokens. | Drop argparse choices/flags and suite launch tokens; keep runtime aggregation aliases and `reporting.py` legacy result-tag pairing for historical artifacts. |
 | 2026-05-22 | Gate 6 batch 8: hard-removal checklist in `gate-6-prep.md` steps 1–7 complete; batch 8 is documentation closure only. | Mark this file `closed`; record Gate 6 tombstones in `docs/removed-materials.md`; leave `general_*` CLI facades as documented post-Gate-6 debt. |
+| 2026-05-22 | Post-Gate-6: `graphfl_lab/general_*` facades and `result_general_*` / `general_suite_*` readers removed; no tracked configs used legacy suite tokens. | Prefer `vision_*` paths only; gitignore pre-rename artifact globs under local experiment trees. |
 
 ## Gate 4c Local Readiness
 

docs/maintenance/last_gate_check.json

@@ -2,6 +2,6 @@
   "gate": "5d-prep",
   "pass": true,
   "failed_checks": [],
-  "verified_at": "2026-05-22T13:25:49.091264+00:00",
-  "commit_sha": "3442c0caf7e818d39bd2d6b5f36e68cc15f6df03"
+  "verified_at": "2026-05-22T13:33:39.051204+00:00",
+  "commit_sha": "4fa973671850982b5366b976c0599ac2976e4761"
 }

docs/removed-materials.md

@@ -25,14 +25,23 @@ Execution log (findings and decisions): [`docs/maintenance/cleanup-status.md`](m
 | CLI `spectral_filtered_*` argparse choices; `--spectral-filter-strength` flag | 7 | `graph_filtered_*` choices; `--graph-filter-strength`; JSON key alias `spectral_filter_strength` retained in `config_io` |
 | Suite launch tokens `ours_spectral_filtered_*` | 7 | `ours_graph_filtered_*`; legacy result tags still paired in `reporting.py` |
 
-## Post-Gate-6 Compatibility Debt (intentional)
+## Post-Gate-6 Cleanup (2026-05-22)
+
+| Removed surface | Replacement / policy |
+|---|---|
+| `graphfl_lab/general_*`, `graphfl_lab/cli/general_*` import/CLI facades | `graphfl_lab.data.vision`, `graphfl_lab.cli.vision_*`, `experiments.suites.vision` |
+| `general_suite_*` / `result_general_*` in artifact discovery | `vision_suite_*` / `result_vision_*` only; short `suite_*` aliases kept |
+| Code paths reading `general_suite_summary.csv` for stress-grid skip | `vision_suite_summary.csv` via `resolve_suite_artifact` |
+
+Legacy experiment trees with old filenames stay **gitignored** (see root `.gitignore`).
+
+## Remaining Compatibility Debt
 
 | Surface | Status | Notes |
 |---|---|---|
-| `graphfl_lab/general_*`, `graphfl_lab/cli/general_*` | retained | thin CLI/import facades; not part of Gate 6 batch 2–7 |
-| `general_suite_*` / `result_general_*` artifact **readers** | retained | historical experiment directories |
 | Runtime `spectral_filtered_*` aggregation **input** aliases | retained | lifecycle/strategy accept legacy target strings |
 | `spectral_filter_strength` in traces / JSON config keys | retained | maps to `graph_filter_strength` |
+| `ours_spectral_filtered_*` in **reporting** result tags | retained | pairs historical run labels only; not suite launch tokens |
 
 ## Tombstones
 

docs/structure.md

@@ -79,14 +79,6 @@ Keep these thin. Add new logic in scoped modules, then re-export only if compati
 ```text
 graphfl_lab/aggregation.py
 graphfl_lab/client.py
-graphfl_lab/general_client.py
-graphfl_lab/general_data.py
-graphfl_lab/general_models.py
-graphfl_lab/general_suite_variants.py
-graphfl_lab/cli/general_experiment.py
-graphfl_lab/cli/general_suite.py
-graphfl_lab/cli/general_client_count_sweep.py
-graphfl_lab/cli/general_stress_grid.py
 graphfl_lab/model.py
 graphfl_lab/spectral_diagnostics.py
 graphfl_lab/strategy.py