Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions src/services/mcp/McpHub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -976,7 +976,10 @@ export class McpHub {
// New server
try {
this.setupFileWatcher(name, validatedConfig, source)
await this.connectToServer(name, validatedConfig, source)
if (!validatedConfig.disabled) {
// Only connect if not disabled
await this.connectToServer(name, validatedConfig, source)
}
} catch (error) {
this.showErrorMessage(`Failed to connect to new MCP server ${name}`, error)
}
Expand All @@ -985,7 +988,10 @@ export class McpHub {
try {
this.setupFileWatcher(name, validatedConfig, source)
await this.deleteConnection(name, source)
await this.connectToServer(name, validatedConfig, source)
if (!validatedConfig.disabled) {
// Only reconnect if not disabled
await this.connectToServer(name, validatedConfig, source)
}
} catch (error) {
this.showErrorMessage(`Failed to reconnect MCP server ${name}`, error)
}
Expand Down
27 changes: 23 additions & 4 deletions webview-ui/src/components/mcp/McpView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
]

const getStatusColor = () => {
// Always show grey for disabled servers regardless of connection status
if (server.disabled) {
return "var(--vscode-descriptionForeground)"
}

switch (server.status) {
case "connected":
return "var(--vscode-testing-iconPassed)"
Expand All @@ -229,7 +234,8 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
}

const handleRowClick = () => {
if (server.status === "connected") {
// Only allow expansion for connected servers that are not disabled
if (server.status === "connected" && !server.disabled) {
setIsExpanded(!isExpanded)
}
}
Expand Down Expand Up @@ -270,12 +276,12 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
alignItems: "center",
padding: "8px",
background: "var(--vscode-textCodeBlock-background)",
cursor: server.status === "connected" ? "pointer" : "default",
cursor: server.status === "connected" && !server.disabled ? "pointer" : "default",
borderRadius: isExpanded || server.status === "connected" ? "4px" : "4px 4px 0 0",
opacity: server.disabled ? 0.6 : 1,
}}
onClick={handleRowClick}>
{server.status === "connected" && (
{server.status === "connected" && !server.disabled && (
<span
className={`codicon codicon-chevron-${isExpanded ? "down" : "right"}`}
style={{ marginRight: "8px" }}
Expand Down Expand Up @@ -342,7 +348,20 @@ const ServerRow = ({ server, alwaysAllowMcp }: { server: McpServer; alwaysAllowM
</div>
</div>

{server.status === "connected" ? (
{server.disabled ? (
// Minimal UI for disabled servers - no error messages or retry buttons
<div
style={{
fontSize: "13px",
background: "var(--vscode-textCodeBlock-background)",
borderRadius: "0 0 4px 4px",
padding: "10px",
color: "var(--vscode-descriptionForeground)",
fontStyle: "italic",
}}>
{t("mcp:serverStatus.disabled")}
</div>
) : server.status === "connected" ? (
isExpanded && (
<div
style={{
Expand Down
3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/ca/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/de/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/en/mcp.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
},
"serverStatus": {
"retrying": "Retrying...",
"retryConnection": "Retry Connection"
"retryConnection": "Retry Connection",
"disabled": "Server is disabled"
},
"execution": {
"running": "Running",
Expand Down
3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/es/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/fr/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/hi/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/id/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/it/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/ja/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/ko/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/nl/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/pl/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/pt-BR/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/ru/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/tr/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/vi/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/zh-CN/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion webview-ui/src/i18n/locales/zh-TW/mcp.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.