Skip to content

fix: MCPServerCheck false negative in subdirectory projects #297

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

Merged
bguidolim merged 1 commit into from
Mar 26, 2026
Merged

fix: MCPServerCheck false negative in subdirectory projects #297

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
21 changes: 15 additions & 6 deletions Sources/mcs/Doctor/CoreDoctorChecks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,13 +68,22 @@ struct MCPServerCheck: DoctorCheck {
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else {
return .fail("~/.claude.json contains invalid JSON")
}
// Check project-scoped servers first (stored under projects[path].mcpServers)
// Walk up to the git root: Claude CLI keys local-scope servers by the git root,
// which may differ from the mcs project root in subdirectory projects.
if let root = projectRoot,
let projects = json[Constants.JSONKeys.projects] as? [String: Any],
let projectEntry = projects[root.path] as? [String: Any],
let projectMCP = projectEntry[Constants.JSONKeys.mcpServers] as? [String: Any],
projectMCP[serverName] != nil {
return .pass("registered")
let projects = json[Constants.JSONKeys.projects] as? [String: Any] {
var candidate: URL? = root
while let path = candidate, path.path != "/" {
if let projectEntry = projects[path.path] as? [String: Any],
let projectMCP = projectEntry[Constants.JSONKeys.mcpServers] as? [String: Any],
projectMCP[serverName] != nil {
return .pass("registered")
}
if FileManager.default.fileExists(atPath: path.appendingPathComponent(".git").path) {
break
}
candidate = path.deletingLastPathComponent()
}
}
// Fall back to global/user-scoped servers
if let mcpServers = json[Constants.JSONKeys.mcpServers] as? [String: Any],
Expand Down
Loading