Skip to content
Closed
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
dfa809c
Refactor MCP
aheizi Apr 13, 2025
6bccb80
Merge branch 'main' into refactor-mcp
aheizi Apr 15, 2025
cb0deb2
Align with the original mcp functions
aheizi Apr 15, 2025
2a08412
Merge branch 'main' into refactor-mcp
aheizi Apr 16, 2025
e147eba
remove unused file
aheizi Apr 16, 2025
9c9cb7d
fix spelling problem
aheizi Apr 16, 2025
95377c4
Use deepEqual serverConfig
aheizi Apr 18, 2025
f57a2e9
Merge branch 'main' into refactor-mcp
aheizi Apr 18, 2025
2498165
Merge branch 'main' into refactor-mcp
aheizi Apr 19, 2025
d87023b
merge main into refactor-mcp
aheizi Apr 26, 2025
e152a93
add `injectEnv` util, support env ref in mcp config (#2679)
aheizi Apr 26, 2025
08df0ae
Merge branch 'main' into refactor-mcp
aheizi Apr 28, 2025
9341d03
fix: suppress eslint no-unused-vars warnings by renaming unused param…
aheizi Apr 28, 2025
b798061
Merge remote-tracking branch 'origin/main' into refactor-mcp
mrubens May 6, 2025
7425df0
Revert locale changes
mrubens May 6, 2025
0bf24ee
Revert Cline.ts changes
mrubens May 6, 2025
c4c3767
Merge branch 'main' into refactor-mcp
aheizi May 7, 2025
9290990
Merge branch 'main' into refactor-mcp && optimize ConnectionHandler
aheizi May 7, 2025
bee7a7b
Merge remote-tracking branch 'origin/refactor-mcp' into refactor-mcp
aheizi May 7, 2025
14101e2
revert formatting
aheizi May 7, 2025
d53c4c2
fix constants.ts
aheizi May 7, 2025
652b964
Merge branch 'main' into refactor-mcp
aheizi May 9, 2025
bb27bb1
Merge branch 'main' into refactor-mcp
aheizi May 9, 2025
3cabd50
revert unnecessary changes
aheizi May 9, 2025
c3d1d88
fix tool's parameters
aheizi May 9, 2025
254437d
fix tool's parameters
aheizi May 9, 2025
4eba4b5
Merge remote-tracking branch 'origin/refactor-mcp' into refactor-mcp
aheizi May 10, 2025
40ff84c
fix mcp restart
aheizi May 10, 2025
9e5862d
Merge branch 'main' into refactor-mcp
aheizi May 10, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended"
]
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"]
}
2 changes: 1 addition & 1 deletion src/core/prompts/instructions/create-mcp-server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ npm run build

4. Whenever you need an environment variable such as an API key to configure the MCP server, walk the user through the process of getting the key. For example, they may need to create an account and go to a developer dashboard to generate the key. Provide step-by-step instructions and URLs to make it easy for the user to retrieve the necessary information. Then use the ask_followup_question tool to ask the user for the key, in this case the OpenWeather API key.

5. Install the MCP Server by adding the MCP server configuration to the settings file located at '${await mcpHub.getMcpSettingsFilePath()}'. The settings file may have other MCP servers already configured, so you would read it first and then add your new server to the existing \`mcpServers\` object.
5. Install the MCP Server by adding the MCP server configuration to the settings file located at '${await mcpHub.getGlobalMcpSettingsFilePath()}'. The settings file may have other MCP servers already configured, so you would read it first and then add your new server to the existing \`mcpServers\` object.

IMPORTANT: Regardless of what else you see in the MCP settings file, you must default any new MCP servers you create to disabled=false and alwaysAllow=[].

Expand Down
3 changes: 1 addition & 2 deletions src/core/webview/webviewMessageHandler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,7 @@ export const webviewMessageHandler = async (provider: ClineProvider, message: We
break
}
case "openMcpSettings": {
const mcpSettingsFilePath = await provider.getMcpHub()?.getMcpSettingsFilePath()

const mcpSettingsFilePath = await provider.getMcpHub()?.getGlobalConfigPath(provider)
if (mcpSettingsFilePath) {
openFile(mcpSettingsFilePath)
}
Expand Down
Loading