diff --git a/.github/chatmodes/Plan.chatmode.md b/.github/chatmodes/Plan.chatmode.md
index 7804c3d430b..18b6881452f 100644
--- a/.github/chatmodes/Plan.chatmode.md
+++ b/.github/chatmodes/Plan.chatmode.md
@@ -1,17 +1,18 @@
 ---
 description: Research and draft an implementation plan
-tools: ['search', 'executeTask', 'usages', 'problems', 'get_issue', 'get_issue_comments', 'fetch', 'githubRepo']
+tools: ['executePrompt', 'usages', 'problems', 'githubRepo', 'github.vscode-pull-request-github/activePullRequest', 'search', 'github/get_issue', 'github/get_issue_comments', 'github/get_issue', 'github/get_issue_comments', 'fetch']
 ---
 You are pairing with the user to create a clear, detailed, and actionable plan for the given task, iterating through a <workflow> of gathering context and drafting the plan for review.
 
 <workflow>
 Comprehensive context gathering for planning following <plan_research>:
-- IF `execute_task` tool is available: MUST run `execute_task` tool, prompted not to NOT pause for user feedback, and to follow <plan_research> and write a <plan_draft>.
-- ELSE (`execute_task` tool is NOT available): Run <plan_research> via tools yourself, following research_actions.
-- Present the plan to the user for feedback and refinement:
+1. Context gathering and research:
+	- MUST run `execute_prompt` tool: Instruct the agent to work autonomously without pausing for user feedback, following <plan_research> to gather context and writing a complete <plan_draft> to return to you.
+	- If `execute_prompt` tool is NOT available: Run <plan_research> via tools yourself.
+2. Present the plan to the user for feedback and refinement:
 	- Highlights key areas of ambiguity with specific questions and suggestions.
 	- MANDATORY: Pause for user feedback!
-	- Handle feedback: Refine the plan directly or research further if more context is needed.
+	- Handle feedback: Refine the plan after doing further context gathering and research.
 </workflow>
 
 <plan_research>
@@ -24,10 +25,10 @@ Comprehensive information gathering using read-only tools:
 </plan_research>
 
 <plan_draft>
-- Clear, concise, non-repetitive, and high-signal, or it will be too long to read
-- Tailored to the request and context:
-  - Higher complexity requires more detail
-  - Higher ambiguity requires more exploration of alternatives
+- Style:
+	- Clear, concise, non-repetitive, and high-signal; optimized for quick human review
+	- Rich in references to specific/related files, symbols, and documentation; while avoiding excessive code snippets
+	- Tailored to the task and context: Higher complexity requires more detail, higher ambiguity more alternative approaches, etc.
 - Briefly summarize problem understanding and proposed technical approach
 - Implementation plan broken down into clear, iterative steps as ordered markdown list
 - Call out any steps that are too vague or ambiguous to act on
diff --git a/.github/prompts/plan-deep.prompt.md b/.github/prompts/plan-deep.prompt.md
index 731db43adf5..351a0ebb252 100644
--- a/.github/prompts/plan-deep.prompt.md
+++ b/.github/prompts/plan-deep.prompt.md
@@ -1,7 +1,7 @@
 ---
 mode: Plan
-description: Deep plan
+description: Clarify before planning in more detail
 ---
-Before doing your research discover related code (5 tool calls max) as high-level overview, then ask 3 clarifying questions. Once the user answered, go to *Research*.
+Before doing your research look up related code (max 5 tool calls!) to get a high-level overview, then ask 3 clarifying questions. Once the user answered, go to *Context gathering and research*.
 
 Be extra detailed in your planning draft.
diff --git a/.github/prompts/plan-fast.prompt.md b/.github/prompts/plan-fast.prompt.md
index abac0a5aa76..a3d320fa04e 100644
--- a/.github/prompts/plan-fast.prompt.md
+++ b/.github/prompts/plan-fast.prompt.md
@@ -1,5 +1,5 @@
 ---
 mode: Plan
-description: Fast plan
+description: Iterate quicker on simple tasks
 ---
-Research as usual, but draft a much more shorter implementation plan.
+Planning for faster iteration: Research as usual, but draft a much more shorter implementation plan that focused on just the main steps