diff --git a/agents/gsd-executor.md b/agents/gsd-executor.md
index df6a5d4bd..602fa51e1 100644
--- a/agents/gsd-executor.md
+++ b/agents/gsd-executor.md
@@ -13,6 +13,19 @@ Spawned by `/gsd:execute-phase` orchestrator.
Your job: Execute the plan completely, commit each task, create SUMMARY.md, update STATE.md.
+
+Before executing, discover project context:
+
+**Project skills:** Check `.agents/skills/` directory if it exists:
+1. List available skills (subdirectories)
+2. Read `SKILL.md` for each skill (lightweight index ~130 lines)
+3. Load specific `rules/*.md` files as needed during implementation
+4. Do NOT load full `AGENTS.md` files (100KB+ context cost)
+5. Follow skill rules relevant to your current task
+
+This ensures project-specific patterns, conventions, and best practices are applied during execution.
+
+
diff --git a/agents/gsd-phase-researcher.md b/agents/gsd-phase-researcher.md
index 801db6a44..6cc964b5d 100644
--- a/agents/gsd-phase-researcher.md
+++ b/agents/gsd-phase-researcher.md
@@ -18,6 +18,19 @@ Spawned by `/gsd:plan-phase` (integrated) or `/gsd:research-phase` (standalone).
- Return structured result to orchestrator
+
+Before researching, discover project context:
+
+**Project skills:** Check `.agents/skills/` directory if it exists:
+1. List available skills (subdirectories)
+2. Read `SKILL.md` for each skill (lightweight index ~130 lines)
+3. Load specific `rules/*.md` files as needed during research
+4. Do NOT load full `AGENTS.md` files (100KB+ context cost)
+5. Research should account for project skill patterns
+
+This ensures research aligns with project-specific conventions and libraries.
+
+
**CONTEXT.md** (if exists) — User decisions from `/gsd:discuss-phase`
diff --git a/agents/gsd-plan-checker.md b/agents/gsd-plan-checker.md
index e939d46c7..2c2982e54 100644
--- a/agents/gsd-plan-checker.md
+++ b/agents/gsd-plan-checker.md
@@ -23,6 +23,19 @@ Goal-backward verification of PLANS before execution. Start from what the phase
You are NOT the executor or verifier — you verify plans WILL work before execution burns context.
+
+Before verifying, discover project context:
+
+**Project skills:** Check `.agents/skills/` directory if it exists:
+1. List available skills (subdirectories)
+2. Read `SKILL.md` for each skill (lightweight index ~130 lines)
+3. Load specific `rules/*.md` files as needed during verification
+4. Do NOT load full `AGENTS.md` files (100KB+ context cost)
+5. Verify plans account for project skill patterns
+
+This ensures verification checks that plans follow project-specific conventions.
+
+
**CONTEXT.md** (if exists) — User decisions from `/gsd:discuss-phase`
diff --git a/agents/gsd-planner.md b/agents/gsd-planner.md
index 90a1167d9..b405876b4 100644
--- a/agents/gsd-planner.md
+++ b/agents/gsd-planner.md
@@ -25,6 +25,19 @@ Your job: Produce PLAN.md files that Claude executors can implement without inte
- Return structured results to orchestrator
+
+Before planning, discover project context:
+
+**Project skills:** Check `.agents/skills/` directory if it exists:
+1. List available skills (subdirectories)
+2. Read `SKILL.md` for each skill (lightweight index ~130 lines)
+3. Load specific `rules/*.md` files as needed during planning
+4. Do NOT load full `AGENTS.md` files (100KB+ context cost)
+5. Ensure plans account for project skill patterns and conventions
+
+This ensures task actions reference the correct patterns and libraries for this project.
+
+
## CRITICAL: User Decision Fidelity
diff --git a/get-shit-done/workflows/execute-phase.md b/get-shit-done/workflows/execute-phase.md
index e902bebce..532918583 100644
--- a/get-shit-done/workflows/execute-phase.md
+++ b/get-shit-done/workflows/execute-phase.md
@@ -121,6 +121,7 @@ Execute each wave in sequence. Within a wave: parallel if `PARALLELIZATION=true`
- Plan: {phase_dir}/{plan_file}
- State: .planning/STATE.md
- Config: .planning/config.json (if exists)
+ - Project skills: .agents/skills/ (if exists — list skills, read SKILL.md for each, follow relevant rules during implementation)
diff --git a/get-shit-done/workflows/plan-phase.md b/get-shit-done/workflows/plan-phase.md
index 0404253cf..3855aad7d 100644
--- a/get-shit-done/workflows/plan-phase.md
+++ b/get-shit-done/workflows/plan-phase.md
@@ -123,6 +123,8 @@ IMPORTANT: If CONTEXT.md exists below, it contains user decisions from /gsd:disc
**Phase requirement IDs (MUST address):** {phase_req_ids}
**Requirements:** {requirements}
**Prior decisions:** {decisions}
+
+**Project skills:** Check .agents/skills/ directory (if exists) — read SKILL.md files, research should account for project skill patterns