Skip to content

Commit ff4acd3

Browse files
LucaButBoringLucaButBoring
authored
Merge branch 'main' into docs/tool-name-conflicts
2 parents 3492196 + c6cb3bb commit ff4acd3

38 files changed

+8399
-85
lines changed

‎docs/clients.mdx

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ This page provides an overview of applications that support the Model Context Pr
1818
| [AgenticFlow][AgenticFlow] | ✅ | ✅ | ✅ | ✅ | ❌ | ❌ | Supports tools, prompts, and resources for no-code AI agents and multi-agent workflows. |
1919
| [Amazon Q CLI][Amazon Q CLI] | ❌ | ✅ | ✅ | ❓ | ❌ | ❌ | Supports prompts and tools. |
2020
| [Apify MCP Tester][Apify MCP Tester] | ❌ | ❌ | ✅ | ✅ | ❌ | ❌ | Supports remote MCP servers and tool discovery. |
21+
| [Augment Code][AugmentCode] | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Supports tools in local and remote agents. |
2122
| [BeeAI Framework][BeeAI Framework] | ❌ | ❌ | ✅ | ❌ | ❌ | ❌ | Supports tools in agentic workflows. |
2223
| [BoltAI][BoltAI] | ❌ | ❌ | ✅ | ❓ | ❌ | ❌ | Supports tools. |
2324
| [Claude.ai][Claude.ai] | ✅ | ✅ | ✅ | ❌ | ❌ | ❌ | Supports tools, prompts, and resources for remote MCP servers. |
@@ -45,6 +46,7 @@ This page provides an overview of applications that support the Model Context Pr
4546
| [mcp-use][mcp-use] | ✅ | ✅ | ✅ | ❓ | ❌ | ❌ | Support tools, resources, stdio & http connection, local llms-agents. |
4647
| [MCPHub][MCPHub] | ✅ | ✅ | ✅ | ❓ | ❌ | ❌ | Supports tools, resources, and prompts in Neovim |
4748
| [MCPOmni-Connect][MCPOmni-Connect] | ✅ | ✅ | ✅ | ❓ | ✅ | ❌ | Supports tools with agentic mode, ReAct, and orchestrator capabilities. |
49+
| [Memex][Memex] | ✅ | ✅ | ✅ | ❓ | ❌ | ❌ | Support tools. Also support *building and testing* MCP server, all-in-one desktop app. |
4850
| [Microsoft Copilot Studio] | ❌ | ❌ | ✅ | ❓ | ❌ | ❌ | Supports tools |
4951
| [MindPal][MindPal] | ❌ | ❌ | ✅ | ❓ | ❌ | ❌ | Supports tools for no-code AI agents and multi-agent workflows. |
5052
| [MooPoint][MooPoint] | ❌ | ❌ | ✅ | ❓ | ✅ | ❌ | Web-Hosted client with tool calling support |
@@ -84,6 +86,7 @@ This page provides an overview of applications that support the Model Context Pr
8486
[AIQ toolkit]: https://github.com/NVIDIA/AIQToolkit
8587
[Amazon Q CLI]: https://github.com/aws/amazon-q-developer-cli
8688
[Apify MCP Tester]: https://apify.com/jiri.spilka/tester-mcp-client
89+
[AugmentCode]: https://augmentcode.com
8790
[BeeAI Framework]: https://i-am-bee.github.io/beeai-framework
8891
[BoltAI]: https://boltai.com
8992
[Claude.ai]: https://claude.ai
@@ -109,6 +112,7 @@ This page provides an overview of applications that support the Model Context Pr
109112
[mcp-use]: https://github.com/pietrozullo/mcp-use
110113
[MCPHub]: https://github.com/ravitemer/mcphub.nvim
111114
[MCPOmni-Connect]: https://github.com/Abiorh001/mcp_omni_connect
115+
[Memex]: https://memex.tech/
112116
[Microsoft Copilot Studio]: https://learn.microsoft.com/en-us/microsoft-copilot-studio/agent-extend-action-mcp
113117
[MindPal]: https://mindpal.io
114118
[MooPoint]: https://moopoint.io
@@ -207,6 +211,17 @@ It uses plain JavaScript (old-school style) and is hosted on Apify, allowing you
207211
- Works with the [Apify MCP Server](https://apify.com/apify/actors-mcp-server) to interact with one or more Apify [Actors](https://apify.com/store).
208212
- Dynamically utilizes tools based on context and user queries (if supported by the server).
209213

214+
### Augment Code
215+
216+
[Augment Code](https://augmentcode.com) is an AI-powered coding platform for VS Code and JetBrains with autonomous agents, chat, and completions. Both local and remote agents are backed by full codebase awareness and native support for MCP, enabling enhanced context through external sources and tools.
217+
218+
**Key features:**
219+
220+
- Full MCP support in local and remote agents.
221+
- Add additional context through MCP servers.
222+
- Automate your development workflows with MCP tools.
223+
- Works in VS Code and JetBrains IDEs.
224+
210225
### BeeAI Framework
211226

212227
[BeeAI Framework](https://i-am-bee.github.io/beeai-framework) is an open-source framework for building, deploying, and serving powerful agentic workflows at scale. The framework includes the **MCP Tool**, a native feature that simplifies the integration of MCP servers into agentic workflows.
@@ -517,6 +532,22 @@ Programmatically assemble prompts for LLMs using [GenAIScript](https://microsoft
517532
- Support for both stdio and SSE transport protocols
518533
- Comprehensive tool orchestration and resource analysis capabilities
519534

535+
### Memex
536+
537+
[Memex](https://memex.tech/) is the first MCP client and MCP server builder - all-in-one desktop app. Unlike traditional MCP clients that only consume existing servers, Memex can create custom MCP servers from natural language prompts, immediately integrate them into its toolkit, and use them to solve problems—all within a single conversation.
538+
539+
**Key features:**
540+
541+
- **Prompt-to-MCP Server**: Generate fully functional MCP servers from natural language descriptions
542+
- **Self-Testing & Debugging**: Autonomously test, debug, and improve created MCP servers
543+
- **Universal MCP Client**: Works with any MCP server through intuitive, natural language integration
544+
- **Curated MCP Directory**: Access to tested, one-click installable MCP servers (Neon, Netlify, GitHub, Context7, and more)
545+
- **Multi-Server Orchestration**: Leverage multiple MCP servers simultaneously for complex workflows
546+
547+
**Learn more:**
548+
549+
- [Memex Launch 2: MCP Teams and Agent API](https://memex.tech/blog/memex-launch-2-mcp-teams-and-agent-api-private-preview-125f)
550+
520551
### Microsoft Copilot Studio
521552

522553
[Microsoft Copilot Studio] is a robust SaaS platform designed for building custom AI-driven applications and intelligent agents, empowering developers to create, deploy, and manage sophisticated AI solutions.

‎docs/development/roadmap.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description: Our plans for evolving Model Context Protocol
55

66
<Info>Last updated: **2025-03-27**</Info>
77

8-
The Model Context Protocol is rapidly evolving. This page outlines our current thinking on key priorities and direction for approximately **the next six months**, though these may change significantly as the project develops. To see what's changed recently, check out the **[specification changelog](/specification/2025-03-26/changelog/)**.
8+
The Model Context Protocol is rapidly evolving. This page outlines our current thinking on key priorities and direction for approximately **the next six months**, though these may change significantly as the project develops. To see what's changed recently, check out the **[specification changelog](/specification/2025-06-18/changelog/)**.
99

1010
<Note>
1111

‎docs/docs.json

Lines changed: 118 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"navigation": {
2020
"versions": [
2121
{
22-
"version": "Version 2025-03-26",
22+
"version": "Version 2025-06-18 (latest)",
2323
"groups": [
2424
{
2525
"group": "User Guide",
@@ -47,11 +47,123 @@
4747
},
4848
{
4949
"group": "Examples",
50+
"pages": ["examples", "clients"]
51+
},
52+
{
53+
"group": "Tutorials",
54+
"pages": [
55+
"tutorials/building-mcp-with-llms",
56+
"docs/tools/debugging",
57+
"docs/tools/inspector"
58+
]
59+
},
60+
"faqs"
61+
]
62+
},
63+
{
64+
"group": "Protocol",
65+
"pages": [
66+
"specification/2025-06-18/index",
67+
"specification/2025-06-18/changelog",
68+
"specification/2025-06-18/architecture/index",
69+
{
70+
"group": "Base Protocol",
71+
"pages": [
72+
"specification/2025-06-18/basic/index",
73+
"specification/2025-06-18/basic/lifecycle",
74+
"specification/2025-06-18/basic/transports",
75+
"specification/2025-06-18/basic/authorization",
76+
"specification/2025-06-18/basic/security_best_practices",
77+
{
78+
"group": "Utilities",
79+
"pages": [
80+
"specification/2025-06-18/basic/utilities/cancellation",
81+
"specification/2025-06-18/basic/utilities/ping",
82+
"specification/2025-06-18/basic/utilities/progress"
83+
]
84+
}
85+
]
86+
},
87+
{
88+
"group": "Client Features",
89+
"pages": [
90+
"specification/2025-06-18/client/roots",
91+
"specification/2025-06-18/client/sampling",
92+
"specification/2025-06-18/client/elicitation"
93+
]
94+
},
95+
{
96+
"group": "Server Features",
97+
"pages": [
98+
"specification/2025-06-18/server/index",
99+
"specification/2025-06-18/server/prompts",
100+
"specification/2025-06-18/server/resources",
101+
"specification/2025-06-18/server/tools",
102+
{
103+
"group": "Utilities",
104+
"pages": [
105+
"specification/2025-06-18/server/utilities/completion",
106+
"specification/2025-06-18/server/utilities/logging",
107+
"specification/2025-06-18/server/utilities/pagination"
108+
]
109+
}
110+
]
111+
}
112+
]
113+
},
114+
{
115+
"group": "Development",
116+
"pages": [
117+
"specification/versioning",
118+
"development/roadmap",
119+
"development/contributing"
120+
]
121+
},
122+
{
123+
"group": "SDKs",
124+
"pages": [
125+
"links/sdks/csharp",
126+
"links/sdks/java",
127+
"links/sdks/kotlin",
128+
"links/sdks/python",
129+
"links/sdks/ruby",
130+
"links/sdks/swift",
131+
"links/sdks/typescript"
132+
]
133+
}
134+
]
135+
},
136+
{
137+
"version": "Version 2025-03-26",
138+
"groups": [
139+
{
140+
"group": "User Guide",
141+
"pages": [
142+
"introduction",
143+
{
144+
"group": "Quickstart",
145+
"pages": [
146+
"quickstart/server",
147+
"quickstart/client",
148+
"quickstart/user"
149+
]
150+
},
151+
{
152+
"group": "Concepts",
50153
"pages": [
51-
"examples",
52-
"clients"
154+
"docs/concepts/architecture",
155+
"docs/concepts/resources",
156+
"docs/concepts/prompts",
157+
"docs/concepts/tools",
158+
"docs/concepts/sampling",
159+
"docs/concepts/roots",
160+
"docs/concepts/transports"
53161
]
54162
},
163+
{
164+
"group": "Examples",
165+
"pages": ["examples", "clients"]
166+
},
55167
{
56168
"group": "Tutorials",
57169
"pages": [
@@ -163,10 +275,7 @@
163275
},
164276
{
165277
"group": "Examples",
166-
"pages": [
167-
"examples",
168-
"clients"
169-
]
278+
"pages": ["examples", "clients"]
170279
},
171280
{
172281
"group": "Tutorials",
@@ -278,10 +387,7 @@
278387
},
279388
{
280389
"group": "Examples",
281-
"pages": [
282-
"examples",
283-
"clients"
284-
]
390+
"pages": ["examples", "clients"]
285391
},
286392
{
287393
"group": "Tutorials",
@@ -395,7 +501,7 @@
395501
},
396502
{
397503
"source": "/specification/latest",
398-
"destination": "/specification/2025-03-26",
504+
"destination": "/specification/2025-06-18",
399505
"permanent": false
400506
}
401507
],

‎docs/quickstart/server.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -896,7 +896,7 @@ public class WeatherService {
896896

897897
@Tool(description = "Get weather alerts for a US state")
898898
public String getAlerts(
899-
@ToolParam(description = "Two-letter US state code (e.g. CA, NY)" String state
899+
@ToolParam(description = "Two-letter US state code (e.g. CA, NY)") String state
900900
) {
901901
// Returns active alerts including:
902902
// - Event type

0 commit comments

Comments
 (0)