Skip to content

style(agents): apply rustfmt to MCP registration paths #284

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Fluzko wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −15
Open

style(agents): apply rustfmt to MCP registration paths #284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion src/agents/mcp_server_registration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,9 @@ mod tests {
"/path with spaces/symposium",
);
assert_eq!(
doc["extensions"]["test-server"]["args"][0].as_str().unwrap(),
doc["extensions"]["test-server"]["args"][0]
.as_str()
.unwrap(),
"--flag:value",
);
}
Expand Down
40 changes: 26 additions & 14 deletions src/agents/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,9 +219,7 @@ impl Agent {
.filter(|v| !v.is_empty())
.map(PathBuf::from)
};
let xdg_config = || {
env_dir("XDG_CONFIG_HOME").unwrap_or_else(|| home.join(".config"))
};
let xdg_config = || env_dir("XDG_CONFIG_HOME").unwrap_or_else(|| home.join(".config"));

match (self, scope) {
// Project MCP is `.mcp.json`; the user-level file is `.claude.json`.
Expand All @@ -231,7 +229,9 @@ impl Agent {
.unwrap_or_else(|| home.to_path_buf())
.join(".claude.json"),

(Agent::Gemini, McpScope::Project) => project_root.join(".gemini").join("settings.json"),
(Agent::Gemini, McpScope::Project) => {
project_root.join(".gemini").join("settings.json")
}
(Agent::Gemini, McpScope::User) => home.join(".gemini").join("settings.json"),

(Agent::OpenCode, McpScope::Project) => project_root.join("opencode.json"),
Expand Down Expand Up @@ -281,15 +281,19 @@ impl Agent {
Agent::Claude => {
mcp_server_registration::register_claude_mcp_servers(&path, servers, out)
}
Agent::Codex => mcp_server_registration::register_codex_mcp_servers(&path, servers, out),
Agent::Codex => {
mcp_server_registration::register_codex_mcp_servers(&path, servers, out)
}
Agent::Copilot => {
mcp_server_registration::register_copilot_mcp_servers(&path, servers, out)
}
Agent::Gemini => {
mcp_server_registration::register_gemini_mcp_servers(&path, servers, out)
}
Agent::Kiro => mcp_server_registration::register_kiro_mcp_servers(&path, servers, out),
Agent::Goose => mcp_server_registration::register_goose_mcp_servers(&path, servers, out),
Agent::Goose => {
mcp_server_registration::register_goose_mcp_servers(&path, servers, out)
}
Agent::OpenCode => {
mcp_server_registration::register_opencode_mcp_servers(&path, servers, out)
}
Expand All @@ -310,15 +314,19 @@ impl Agent {
Agent::Claude => {
mcp_server_registration::unregister_claude_mcp_servers(&path, names, out)
}
Agent::Codex => mcp_server_registration::unregister_codex_mcp_servers(&path, names, out),
Agent::Codex => {
mcp_server_registration::unregister_codex_mcp_servers(&path, names, out)
}
Agent::Copilot => {
mcp_server_registration::unregister_copilot_mcp_servers(&path, names, out)
}
Agent::Gemini => {
mcp_server_registration::unregister_gemini_mcp_servers(&path, names, out)
}
Agent::Kiro => mcp_server_registration::unregister_kiro_mcp_servers(&path, names, out),
Agent::Goose => mcp_server_registration::unregister_goose_mcp_servers(&path, names, out),
Agent::Goose => {
mcp_server_registration::unregister_goose_mcp_servers(&path, names, out)
}
Agent::OpenCode => {
mcp_server_registration::unregister_opencode_mcp_servers(&path, names, out)
}
Expand Down Expand Up @@ -1049,7 +1057,11 @@ mod tests {
let project = Path::new("/project");
let home = Path::new("/home/user");
let cases = [
(Agent::Claude, "/project/.mcp.json", "/home/user/.claude.json"),
(
Agent::Claude,
"/project/.mcp.json",
"/home/user/.claude.json",
),
(
Agent::Gemini,
"/project/.gemini/settings.json",
Expand Down Expand Up @@ -1149,13 +1161,13 @@ mod tests {
if agent == Agent::Gemini {
continue;
}
for (scope, root) in [
(McpScope::Project, project),
(McpScope::User, home),
] {
for (scope, root) in [(McpScope::Project, project), (McpScope::User, home)] {
let mcp = agent.mcp_config_path(scope, project, home);
for hooks in hook_paths_for(agent, root) {
assert_ne!(mcp, hooks, "{agent:?} {scope:?} writes MCP into its hooks file");
assert_ne!(
mcp, hooks,
"{agent:?} {scope:?} writes MCP into its hooks file"
);
}
}
}
Expand Down
Loading