diff --git a/.github/prompts/code-review.prompt.md b/.github/prompts/code-review.prompt.md
index 6196c32293..3a64abec0b 100644
--- a/.github/prompts/code-review.prompt.md
+++ b/.github/prompts/code-review.prompt.md
@@ -1,18 +1,20 @@
 ---
 name: code-review
-description: AI-assisted code review for a pull request in Microsoft.Data.SqlClient.
+description: AI-assisted code review for a pull request or branch in Microsoft.Data.SqlClient.
 argument-hint: <PR number or branch name>
 agent: agent
-tools: ['github/search_issues', 'read/readFile', 'codebase/search']
+tools: ['github/search_issues', 'github/pull_request_read', 'github/get_file_contents', 'github/run_secret_scanning', 'read/readFile', 'search']
 ---
 
-Review the pull request "${input:pr}" in `dotnet/SqlClient`.
+Review the changes in "${input:target}" for `dotnet/SqlClient`.
+
+The target may be either a **PR number** (e.g., `4106`) or a **branch name** (e.g., `dev/user/my-feature`). Determine which by checking whether the value is purely numeric.
 
 Follow this structured review process:
 
 ## 1. Understand the Change
-- Fetch the PR details: title, description, linked issue(s), and diff.
 - Read the PR description to understand the intent and scope of the change.
+- Check for linked issues referenced in the description (e.g., `Fixes #...`).
 - Check which files are modified and categorize them:
   - **Source code** (`src/Microsoft.Data.SqlClient/src/`) — the main review focus
   - **Tests** (`tests/`) — verify coverage
diff --git a/.github/prompts/generate-prompt.prompt.md b/.github/prompts/generate-prompt.prompt.md
index a4aa8cd40f..96e3c25f76 100644
--- a/.github/prompts/generate-prompt.prompt.md
+++ b/.github/prompts/generate-prompt.prompt.md
@@ -2,6 +2,7 @@
 name: generate-prompt
 description: Generates high-quality VS Code Copilot prompt files (.prompt.md) based on user descriptions, leveraging available skills.
 argument-hint: Describe the prompt you want to create (e.g., "A prompt to generate unit tests for C#")
+tools: [read, edit, search, todo]
 ---
 You are an expert AI prompt developer specialized in creating **Visual Studio Code Copilot Prompt Files (`.prompt.md`)**.
 
diff --git a/.github/prompts/generate-skill.prompt.md b/.github/prompts/generate-skill.prompt.md
index 484fe2debc..e258adedc6 100644
--- a/.github/prompts/generate-skill.prompt.md
+++ b/.github/prompts/generate-skill.prompt.md
@@ -2,6 +2,8 @@
 name: generate-skill
 description: Generate a GitHub Copilot Agent Skill (SKILL.md) following best practices and official documentation
 argument-hint: Describe the skill you want to create (e.g., "debugging SQL connection issues")
+agent: agent
+tools: ['read/readFile', 'edit/createFile', 'search']
 ---
 You are an expert developer specialized in creating **GitHub Copilot Agent Skills**.
 
diff --git a/.github/prompts/update-build-pipelines.prompt.md b/.github/prompts/update-build-pipelines.prompt.md
index 617cf39901..a4715fa000 100644
--- a/.github/prompts/update-build-pipelines.prompt.md
+++ b/.github/prompts/update-build-pipelines.prompt.md
@@ -3,7 +3,7 @@ name: update-build-pipelines
 description: Guided workflow for updating Azure DevOps CI/CD pipelines for Microsoft.Data.SqlClient.
 argument-hint: <describe the pipeline change needed>
 agent: agent
-tools: ['edit/createFile', 'edit/editFiles', 'read/readFile', 'codebase/search']
+tools: ['edit/createFile', 'edit/editFiles', 'read/readFile', 'search']
 ---
 
 Update the Azure DevOps build pipelines for: "${input:change}".