diff --git a/.github/agents/Maintainer.agent.md b/.github/agents/Maintainer.agent.md
index 77783b87..b7427f3e 100644
--- a/.github/agents/Maintainer.agent.md
+++ b/.github/agents/Maintainer.agent.md
@@ -2,44 +2,50 @@
 description: "Project maintainer for Python Environment Tools (PET). Drives planning from open issues, implements Rust changes, self-reviews via Reviewer agent, and manages the full PR lifecycle with Copilot review."
 tools:
   [
-    "vscode/getProjectSetupInfo",
-    "vscode/runCommand",
-    "vscode/askQuestions",
-    "execute/getTerminalOutput",
-    "execute/awaitTerminal",
-    "execute/killTerminal",
-    "execute/createAndRunTask",
-    "execute/testFailure",
-    "execute/runInTerminal",
-    "read/terminalSelection",
-    "read/terminalLastCommand",
-    "read/problems",
-    "read/readFile",
-    "agent",
-    "github/add_comment_to_pending_review",
-    "github/add_issue_comment",
-    "github/create_pull_request",
-    "github/get_label",
-    "github/issue_read",
-    "github/issue_write",
-    "github/list_branches",
-    "github/list_commits",
-    "github/list_issues",
-    "github/list_pull_requests",
-    "github/merge_pull_request",
-    "github/pull_request_read",
-    "github/pull_request_review_write",
-    "github/request_copilot_review",
-    "github/search_issues",
-    "github/search_pull_requests",
-    "github/update_pull_request",
-    "github/update_pull_request_branch",
-    "edit/createDirectory",
-    "edit/createFile",
-    "edit/editFiles",
-    "search",
-    "web",
-    "todo",
+    vscode/getProjectSetupInfo,
+    vscode/runCommand,
+    vscode/askQuestions,
+    execute/getTerminalOutput,
+    execute/killTerminal,
+    execute/sendToTerminal,
+    execute/runInTerminal,
+    execute/executionSubagent,
+    read/terminalSelection,
+    read/terminalLastCommand,
+    read/problems,
+    read/readFile,
+    agent/runSubagent,
+    edit/createDirectory,
+    edit/createFile,
+    edit/editFiles,
+    search/changes,
+    search/codebase,
+    search/fileSearch,
+    search/listDirectory,
+    search/textSearch,
+    search/searchSubagent,
+    search/usages,
+    web/fetch,
+    github/add_comment_to_pending_review,
+    github/add_issue_comment,
+    github/add_reply_to_pull_request_comment,
+    github/create_pull_request,
+    github/get_label,
+    github/issue_read,
+    github/issue_write,
+    github/list_branches,
+    github/list_commits,
+    github/list_issues,
+    github/list_pull_requests,
+    github/merge_pull_request,
+    github/pull_request_read,
+    github/pull_request_review_write,
+    github/request_copilot_review,
+    github/search_issues,
+    github/search_pull_requests,
+    github/update_pull_request,
+    github/update_pull_request_branch,
+    todo,
   ]
 ---
 
diff --git a/.github/agents/Reviewer.agent.md b/.github/agents/Reviewer.agent.md
index df7327cf..2b6b41dd 100644
--- a/.github/agents/Reviewer.agent.md
+++ b/.github/agents/Reviewer.agent.md
@@ -2,19 +2,21 @@
 description: "Deep code reviewer for PET (Python Environment Tools). Catches environment misidentification, locator ordering issues, thread safety problems, platform-specific bugs, and JSONRPC protocol violations that automated tools miss."
 tools:
   [
-    "read/problems",
-    "read/readFile",
-    "agent",
-    "github/issue_read",
-    "github/list_issues",
-    "github/list_pull_requests",
-    "github/pull_request_read",
-    "github/search_code",
-    "github/search_issues",
-    "github/search_pull_requests",
-    "search",
-    "web",
+    read/problems,
+    read/readFile,
+    read/viewImage,
+    agent,
+    search,
+    web,
+    github/issue_read,
+    github/list_issues,
+    github/list_pull_requests,
+    github/pull_request_read,
+    github/search_code,
+    github/search_issues,
+    github/search_pull_requests,
   ]
+user-invocable: false
 ---
 
 # Code Reviewer