062581938b
Filtering disabled shared servers out of `.mcp.json` (#9457) collapsed "present but disabled" and "absent" into the same output, so a server set `enabled = false` for OpenCode could no longer remain present in Claude Code. `.mcp.json` has no per-server `enabled` field, but settings.json does via `disabledMcpjsonServers`. Keep disabled servers in `.mcp.json` and list them under `disabledMcpjsonServers` (merged with any user-set value). This honors the disabled intent without dropping the server, and covers both shared and Claude Code-native servers.
88 lines
2.2 KiB
Nix
88 lines
2.2 KiB
Nix
{ config, ... }:
|
|
|
|
{
|
|
programs = {
|
|
claude-code = {
|
|
package = config.lib.test.mkStubPackage {
|
|
name = "claude-code";
|
|
buildScript = ''
|
|
mkdir -p $out/bin
|
|
touch $out/bin/claude
|
|
chmod 755 $out/bin/claude
|
|
'';
|
|
};
|
|
enable = true;
|
|
|
|
enableMcpIntegration = true;
|
|
|
|
mcpServers = {
|
|
github = {
|
|
type = "http";
|
|
url = "https://api.githubcopilot.com/mcp/";
|
|
enabled = true;
|
|
};
|
|
filesystem = {
|
|
type = "stdio";
|
|
command = "npx";
|
|
args = [
|
|
"-y"
|
|
"@modelcontextprotocol/server-filesystem"
|
|
"/tmp"
|
|
];
|
|
};
|
|
};
|
|
};
|
|
mcp = {
|
|
enable = true;
|
|
servers = {
|
|
filesystem = {
|
|
type = "stdio";
|
|
command = "npx";
|
|
args = [
|
|
"-y"
|
|
"@modelcontextprotocol/server-filesystem"
|
|
"/other-tmp"
|
|
];
|
|
};
|
|
database = {
|
|
command = "npx";
|
|
args = [
|
|
"-y"
|
|
"@bytebase/dbhub"
|
|
"--dsn"
|
|
"postgresql://user:pass@localhost:5432/db"
|
|
];
|
|
env = {
|
|
DATABASE_URL = "postgresql://user:pass@localhost:5432/db";
|
|
};
|
|
};
|
|
customTransport = {
|
|
type = "websocket";
|
|
url = "wss://example.com/mcp";
|
|
customOption = "value";
|
|
timeout = 5000;
|
|
};
|
|
disabled-server = {
|
|
command = "echo";
|
|
args = [ "test" ];
|
|
disabled = true;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
nmt.script = ''
|
|
wrapperPath="$TESTED/home-path/bin/claude"
|
|
normalizedWrapper=$(normalizeStorePaths "$wrapperPath")
|
|
assertFileContent "$normalizedWrapper" ${./expected-mcp-wrapper}
|
|
|
|
pluginDir=$(grep -o -- '--plugin-dir /nix/store/[^ ]*' "$wrapperPath")
|
|
pluginDir="''${pluginDir#--plugin-dir }"
|
|
assertFileContent "$pluginDir/.claude-plugin/plugin.json" ${./expected-plugin-manifest.json}
|
|
assertFileContent "$pluginDir/.mcp.json" ${./expected-mcp-integration-plugin.json}
|
|
assertPathNotExists "$pluginDir/.lsp.json"
|
|
|
|
settingsPath="$TESTED/home-files/.claude/settings.json"
|
|
assertFileContent "$settingsPath" ${./expected-mcp-settings.json}
|
|
'';
|
|
}
|