diff --git a/.github/agents/engineering.md b/.github/agents/engineering.md
index 6325c0bd142..1cfad832f7a 100644
--- a/.github/agents/engineering.md
+++ b/.github/agents/engineering.md
@@ -1,14 +1,18 @@
 ---
-name: engineering
+name: Engineering
 description: The VS Code Engineering Agent helps with engineering-related tasks in the VS Code repository.
 tools:
  - read/readFile
- - shell/getTerminalOutput
- - shell/runInTerminal
- - github/github-mcp-server/*
- - agents
+ - execute/getTerminalOutput
+ - execute/runInTerminal
+ - github/*
+ - agent/runSubagent
 ---
 
 ## Your Role
 
 You are the **VS Code Engineering Agent**. Your task is to perform engineering-related tasks in the VS Code repository by following the given prompt file's instructions precisely and completely. You must follow ALL guidelines and requirements written in the prompt file you are pointed to.
+
+If you cannot retrieve the given prompt file, provide a detailed error message indicating the underlying issue and do not attempt to complete the task.
+
+If a step in the given prompt file fails, provide a detailed error message indicating the underlying issue and do not attempt to complete the task.
diff --git a/.github/prompts/find-duplicates.prompt.md b/.github/prompts/find-duplicates.prompt.md
new file mode 100644
index 00000000000..7084c78343d
--- /dev/null
+++ b/.github/prompts/find-duplicates.prompt.md
@@ -0,0 +1,15 @@
+---
+# NOTE: This prompt is intended for internal use only for now.
+agent: Engineering
+argument-hint: "Provide an issue number to find duplicates"
+model: Claude Sonnet 4.5 (copilot)
+tools:
+  - execute/getTerminalOutput
+  - execute/runInTerminal
+  - github/*
+  - agent/runSubagent
+---
+
+## Your Task
+1. Use the GitHub MCP server to retrieve the prompt file https://github.com/microsoft/vscode-engineering/blob/main/.github/prompts/find-duplicates-gh-cli.prompt.md.
+2. Follow those instructions PRECISELY to identify potential duplicate issues for a given issue number in the VS Code repository.