diff --git a/panel/src/components/settings/feature-flags-card.tsx b/panel/src/components/settings/feature-flags-card.tsx
index 1b36d713..cad04b0a 100644
--- a/panel/src/components/settings/feature-flags-card.tsx
+++ b/panel/src/components/settings/feature-flags-card.tsx
@@ -26,6 +26,8 @@ const FLAG_DESCRIPTIONS: Record<string, string> = {
   self_heal_originate_enabled:
     "Also open a PENDING fix task for a detected regression (needs Self-healing on; the task waits for your approval).",
   provisioning_enabled: "Auto-provision projects from approved pitches.",
+  toolchain_match_enabled:
+    "Provision each agent workspace with the target project's Python (not RoboCo's) and block delivery gates when its test suite can't be executed.",
   rag_auto_update_enabled: "Keep the knowledge base index refreshed automatically.",
   transcript_prune_enabled: "Run the background sweep that prunes old transcripts.",
 };
diff --git a/roboco/services/settings.py b/roboco/services/settings.py
index 67ec367c..8e31fb63 100644
--- a/roboco/services/settings.py
+++ b/roboco/services/settings.py
@@ -51,6 +51,7 @@ FEATURE_FLAGS: tuple[tuple[str, str], ...] = (
     ("self_heal_enabled", "Self-healing (detect + notify)"),
     ("self_heal_originate_enabled", "Self-healing — open fix tasks"),
     ("provisioning_enabled", "Pitch auto-provisioning"),
+    ("toolchain_match_enabled", "Agent runtime toolchain matching"),
     ("rag_auto_update_enabled", "RAG auto-update"),
     ("transcript_prune_enabled", "Transcript pruning"),
 )