diff --git a/apps/backend/agents/tools_pkg/models.py b/apps/backend/agents/tools_pkg/models.py
index fddb5091..8f9fcb9f 100644
--- a/apps/backend/agents/tools_pkg/models.py
+++ b/apps/backend/agents/tools_pkg/models.py
@@ -46,7 +46,7 @@ TOOL_UPDATE_QA_STATUS = "mcp__auto-claude__update_qa_status"
 # Context7 MCP tools for documentation lookup (always enabled)
 CONTEXT7_TOOLS = [
     "mcp__context7__resolve-library-id",
-    "mcp__context7__get-library-docs",
+    "mcp__context7__query-docs",
 ]
 
 # Linear MCP tools for project management (when LINEAR_API_KEY is set)
diff --git a/apps/backend/prompts/coder.md b/apps/backend/prompts/coder.md
index d7a7bc52..536c675c 100644
--- a/apps/backend/prompts/coder.md
+++ b/apps/backend/prompts/coder.md
@@ -342,7 +342,7 @@ Input: { "libraryName": "[library name from subtask]" }
 
 **Step 2: Get relevant documentation**
 ```
-Tool: mcp__context7__get-library-docs
+Tool: mcp__context7__query-docs
 Input: {
   "context7CompatibleLibraryID": "[library-id]",
   "topic": "[specific feature you're implementing]",
@@ -353,7 +353,7 @@ Input: {
 **Example workflow:**
 If subtask says "Add Stripe payment integration":
 1. `resolve-library-id` with "stripe"
-2. `get-library-docs` with topic "payments" or "checkout"
+2. `query-docs` with topic "payments" or "checkout"
 3. Use the exact patterns from documentation
 
 **This prevents:**
diff --git a/apps/backend/prompts/qa_reviewer.md b/apps/backend/prompts/qa_reviewer.md
index ff52320a..14a9b0c0 100644
--- a/apps/backend/prompts/qa_reviewer.md
+++ b/apps/backend/prompts/qa_reviewer.md
@@ -239,7 +239,7 @@ Input: { "libraryName": "[library name]" }
 
 **Step 3: Verify API usage matches documentation**
 ```
-Tool: mcp__context7__get-library-docs
+Tool: mcp__context7__query-docs
 Input: {
   "context7CompatibleLibraryID": "[library-id]",
   "topic": "[relevant topic - e.g., the function being used]",
diff --git a/apps/backend/prompts/spec_critic.md b/apps/backend/prompts/spec_critic.md
index 2f0f08fb..b0d3877d 100644
--- a/apps/backend/prompts/spec_critic.md
+++ b/apps/backend/prompts/spec_critic.md
@@ -60,7 +60,7 @@ Tool: mcp__context7__resolve-library-id
 Input: { "libraryName": "[library from spec]" }
 
 # Step 2: Verify API patterns mentioned in spec
-Tool: mcp__context7__get-library-docs
+Tool: mcp__context7__query-docs
 Input: {
   "context7CompatibleLibraryID": "[library-id]",
   "topic": "[specific API or feature mentioned in spec]",
@@ -305,7 +305,7 @@ When analyzing, think through:
 >
 > Let me also verify with Context7 - I'll look up the actual package name and API patterns to confirm...
 > [Use mcp__context7__resolve-library-id to find the library]
-> [Use mcp__context7__get-library-docs to check API patterns]
+> [Use mcp__context7__query-docs to check API patterns]
 >
 > Next, looking at the API patterns. The research shows initialization requires [steps], but the spec shows [different steps]. Let me cross-reference with Context7 documentation... Another issue confirmed.
 >
diff --git a/apps/backend/prompts/spec_researcher.md b/apps/backend/prompts/spec_researcher.md
index 9d3af8b1..e94c901d 100644
--- a/apps/backend/prompts/spec_researcher.md
+++ b/apps/backend/prompts/spec_researcher.md
@@ -63,7 +63,7 @@ This returns the Context7-compatible ID (e.g., "/vercel/next.js").
 Once you have the ID, fetch documentation for specific topics:
 
 ```
-Tool: mcp__context7__get-library-docs
+Tool: mcp__context7__query-docs
 Input: {
   "context7CompatibleLibraryID": "/vercel/next.js",
   "topic": "routing",  // Focus on relevant topic
@@ -244,7 +244,7 @@ research.json created successfully.
 
 1. **Context7 MCP** (PRIMARY) - Best for official docs, API patterns, code examples
    - Use `resolve-library-id` first to get the library ID
-   - Then `get-library-docs` with relevant topics
+   - Then `query-docs` with relevant topics
    - Covers most popular libraries (React, Next.js, FastAPI, etc.)
 
 2. **Web Search** - For package verification, recent info, obscure libraries
@@ -271,7 +271,7 @@ Input: { "libraryName": "graphiti" }
 
 If found in Context7:
 ```
-Tool: mcp__context7__get-library-docs
+Tool: mcp__context7__query-docs
 Input: {
   "context7CompatibleLibraryID": "/zep/graphiti",
   "topic": "getting started",
diff --git a/apps/frontend/src/renderer/components/AgentTools.tsx b/apps/frontend/src/renderer/components/AgentTools.tsx
index 8510cfbf..e32573a1 100644
--- a/apps/frontend/src/renderer/components/AgentTools.tsx
+++ b/apps/frontend/src/renderer/components/AgentTools.tsx
@@ -270,7 +270,7 @@ const MCP_SERVERS: Record<string, { name: string; description: string; icon: Rea
     name: 'Context7',
     description: 'Documentation lookup for libraries and frameworks via @upstash/context7-mcp',
     icon: Search,
-    tools: ['mcp__context7__resolve-library-id', 'mcp__context7__get-library-docs'],
+    tools: ['mcp__context7__resolve-library-id', 'mcp__context7__query-docs'],
   },
   'graphiti-memory': {
     name: 'Graphiti Memory',