diff --git a/templates/commands/clarify.md b/templates/commands/clarify.md
index 8663b6908b..ea92264074 100644
--- a/templates/commands/clarify.md
+++ b/templates/commands/clarify.md
@@ -124,7 +124,7 @@ Execution steps:
 
    For each category with Partial or Missing status, add a candidate question opportunity unless:
    - Clarification would not materially change implementation or validation strategy
-   - Information is better deferred to planning phase (note internally)
+   - The item is specifically about implementation method, tech-stack comparison, or task breakdown (note internally)
 
 4. Generate (internally) a prioritized queue of candidate clarification questions (maximum 5). Do NOT output them all at once. Apply these constraints:
     - Maximum of 5 total questions across the whole session.
diff --git a/tests/test_clarify_stage_gate.py b/tests/test_clarify_stage_gate.py
new file mode 100644
index 0000000000..1c21ef9886
--- /dev/null
+++ b/tests/test_clarify_stage_gate.py
@@ -0,0 +1,19 @@
+"""The planning deferral in ``templates/commands/clarify.md`` must stay bounded (#1717).
+
+The old catch-all ("Information is better deferred to planning phase") let
+agents skip NFRs, acceptance criteria, and edge cases. Defer only
+implementation method, tech-stack comparison, or task breakdown.
+"""
+
+from pathlib import Path
+
+CLARIFY = Path(__file__).parent.parent / "templates" / "commands" / "clarify.md"
+
+
+def test_clarify_planning_deferral_is_bounded() -> None:
+    text = CLARIFY.read_text(encoding="utf-8")
+    assert "- Information is better deferred to planning phase (note internally)" not in text
+    assert (
+        "implementation method, tech-stack comparison, or task breakdown"
+        in text
+    )