ROB-1238 top level dict mcp_servers for list of remote mcp servers. - #453
Merged
Merged
Conversation
Contributor
## Walkthrough
The changes update the way toolsets and MCP servers are parsed and merged in the configuration logic. The `parse_toolsets_file` function now combines entries from both "toolsets" and "mcp_servers," explicitly tagging MCP servers with a "type" field. Toolset instantiation now relies on this "type" field. The `Toolset` class gains an optional `type` attribute.
## Changes
| File(s) | Change Summary |
|--------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------|
| holmes/config.py | Modified toolsets parsing to merge "toolsets" and "mcp_servers", tagging MCP servers with "type". Updated merging logic to instantiate toolsets based on the "type" field. |
| holmes/core/tools.py | Added enum `ToolsetType` and optional `type` attribute to the `Toolset` class. |
| helm/holmes/templates/toolset-config.yaml, helm/holmes/values.yaml | Added `mcp_servers` key to Helm values and ConfigMap template to support MCP server configuration alongside toolsets. |
## Sequence Diagram(s)
```mermaid
sequenceDiagram
participant Config
participant YAMLFile
participant Toolset
participant RemoteMCPToolset
Config->>YAMLFile: parse_toolsets_file()
YAMLFile-->>Config: Returns toolsets + mcp_servers (with type="MCP")
Config->>Config: merge_and_override_bultin_toolsets_with_toolsets_config()
alt type == "MCP"
Config->>RemoteMCPToolset: Instantiate RemoteMCPToolset
else
Config->>Toolset: Instantiate YAMLToolset
endPossibly related PRs
Suggested reviewers
|
RoiGlinik
changed the title
moshemorad
requested changes
May 26, 2025
RoiGlinik
changed the title
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Actionable comments posted: 0
🧹 Nitpick comments (1)
helm/holmes/templates/toolset-config.yaml (1)
1-2: Consider extending the conditional to covermcp_servers.Currently the ConfigMap is only rendered when
.Values.toolsetsis non-empty:{{- if .Values.toolsets | not | empty }}If you’d like the ConfigMap to also be created when
mcp_serversis defined (even iftoolsetsis empty), you can change it to:{{- if or (not (empty .Values.toolsets)) (not (empty .Values.mcp_servers)) }}This ensures the map is generated whenever either block has data.
🧰 Tools
🪛 YAMLlint (1.37.1)
[error] 1-1: syntax error: expected the node content, but found '-'
(syntax)
📜 Review details
Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (2)
helm/holmes/templates/toolset-config.yaml(1 hunks)helm/holmes/values.yaml(1 hunks)
✅ Files skipped from review due to trivial changes (1)
- helm/holmes/values.yaml
⏰ Context from checks skipped due to timeout of 90000ms (1)
- GitHub Check: build (3.12)
🔇 Additional comments (1)
helm/holmes/templates/toolset-config.yaml (1)
10-10: Ensuremcp_serversHelm value is defined and documented.The new
mcp_serversentry will rendernullor error out if.Values.mcp_serversis missing from your chart’svalues.yaml. Please confirm that:
- A top-level
mcp_serverskey exists invalues.yaml(even if it’s just an empty list/dict).- The chart README or comments are updated to describe the purpose and format of
mcp_servers.
Contributor
pavangudiwada
changed the title
Merged
This was referenced Dec 29, 2025
Merged
This was referenced Feb 16, 2026
This was referenced Mar 15, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit