diff --git a/.github/prompts/codenotify.prompt.md b/.github/prompts/codenotify.prompt.md
index 15f679fc1b1..23b42157397 100644
--- a/.github/prompts/codenotify.prompt.md
+++ b/.github/prompts/codenotify.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 tools: ['edit', 'search', 'runCommands', 'fetch', 'todos']
 ---
 
diff --git a/.github/prompts/component.prompt.md b/.github/prompts/component.prompt.md
index 9aa2eb6d176..5297e2b6ad4 100644
--- a/.github/prompts/component.prompt.md
+++ b/.github/prompts/component.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 description: 'Help author a component specification for an agent.'
 tools: ['edit', 'search', 'usages', 'vscodeAPI', 'fetch', 'extensions', 'todos']
 ---
diff --git a/.github/prompts/data.prompt.md b/.github/prompts/data.prompt.md
index f3fe3292aaf..4185ebb4141 100644
--- a/.github/prompts/data.prompt.md
+++ b/.github/prompts/data.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 description: 'Answer telemetry questions with data queries'
 tools: ['search', 'runCommands/runInTerminal', 'Azure MCP/kusto_query', 'githubRepo', 'extensions', 'todos']
 ---
diff --git a/.github/prompts/fixIssueNo.prompt.md b/.github/prompts/fixIssueNo.prompt.md
index 6438f4614fe..0184204d3b4 100644
--- a/.github/prompts/fixIssueNo.prompt.md
+++ b/.github/prompts/fixIssueNo.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: Plan
+agent: Plan
 tools: ['runCommands', 'runTasks', 'runNotebooks', 'search', 'new', 'usages', 'vscodeAPI', 'problems', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'todos', 'runTests', 'get_issue', 'get_issue_comments', 'get_me', 'get_pull_request', 'get_pull_request_diff', 'get_pull_request_files']
 ---
 
diff --git a/.github/prompts/implement.prompt.md b/.github/prompts/implement.prompt.md
index 190ff25f9ec..4deb7ba76d7 100644
--- a/.github/prompts/implement.prompt.md
+++ b/.github/prompts/implement.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 description: 'Implement the plan'
 tools: ['edit', 'runNotebooks', 'search', 'new', 'runCommands', 'runTasks', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
 ---
diff --git a/.github/prompts/no-any.prompt.md b/.github/prompts/no-any.prompt.md
index f5a4b595e5c..7e78fefa27e 100644
--- a/.github/prompts/no-any.prompt.md
+++ b/.github/prompts/no-any.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 description: 'Remove any usage of the any type in TypeScript files'
 ---
 
diff --git a/.github/prompts/plan-deep.prompt.md b/.github/prompts/plan-deep.prompt.md
index 412bae87cbc..a321fbe2cbb 100644
--- a/.github/prompts/plan-deep.prompt.md
+++ b/.github/prompts/plan-deep.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: Plan
+agent: Plan
 description: Clarify before planning in more detail
 ---
 Before doing your research workflow, gather preliminary context using #runSubagent (instructed to use max 5 tool calls) to get a high-level overview.
diff --git a/.github/prompts/plan-fast.prompt.md b/.github/prompts/plan-fast.prompt.md
index a3d320fa04e..2ae8191933a 100644
--- a/.github/prompts/plan-fast.prompt.md
+++ b/.github/prompts/plan-fast.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: Plan
+agent: Plan
 description: Iterate quicker on simple tasks
 ---
 Planning for faster iteration: Research as usual, but draft a much more shorter implementation plan that focused on just the main steps
diff --git a/.github/prompts/plan.prompt.md b/.github/prompts/plan.prompt.md
index 53a5fa9b0fb..e94ee7b24eb 100644
--- a/.github/prompts/plan.prompt.md
+++ b/.github/prompts/plan.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: Plan
+agent: Plan
 description: 'Start planning'
 ---
 Start planning.
diff --git a/.github/prompts/setup-environment.prompt.md b/.github/prompts/setup-environment.prompt.md
index e35870dd477..fa934ad7029 100644
--- a/.github/prompts/setup-environment.prompt.md
+++ b/.github/prompts/setup-environment.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 description: First Time Setup
 tools: ['runCommands', 'runTasks/runTask', 'search', 'todos', 'fetch']
 ---
diff --git a/.github/prompts/update-instructions.prompt.md b/.github/prompts/update-instructions.prompt.md
index 8ba53454822..b38001671ef 100644
--- a/.github/prompts/update-instructions.prompt.md
+++ b/.github/prompts/update-instructions.prompt.md
@@ -1,5 +1,5 @@
 ---
-mode: agent
+agent: agent
 ---
 
 Read the changes introduced on the current branch, including BOTH: