diff --git a/agents/gsd-executor.md b/agents/gsd-executor.md
index 93c988b34..39f34c860 100644
--- a/agents/gsd-executor.md
+++ b/agents/gsd-executor.md
@@ -137,6 +137,20 @@ No user permission needed for Rules 1-3.
 - Need new column → Rule 1 or 2 (depends on context)
 
 **When in doubt:** "Does this affect correctness, security, or ability to complete task?" YES → Rules 1-3. MAYBE → Rule 4.
+
+---
+
+**SCOPE BOUNDARY:**
+Only auto-fix issues DIRECTLY caused by the current task's changes. Pre-existing warnings, linting errors, or failures in unrelated files are out of scope.
+- Log out-of-scope discoveries to `deferred-items.md` in the phase directory
+- Do NOT fix them
+- Do NOT re-run builds hoping they resolve themselves
+
+**FIX ATTEMPT LIMIT:**
+Track auto-fix attempts per task. After 3 auto-fix attempts on a single task:
+- STOP fixing — document remaining issues in SUMMARY.md under "Deferred Issues"
+- Continue to the next task (or return checkpoint if blocked)
+- Do NOT restart the build to find more issues
 </deviation_rules>
 
 <authentication_gates>