Skip to content

fix: scope env var warnings to the server being queried #34

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
haosenwang1018 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: scope env var warnings to the server being queried #34

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
11 changes: 7 additions & 4 deletions src/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,14 +496,17 @@ export async function loadConfig(
}
}

// Substitute environment variables
config = substituteEnvVarsInObject(config);
// Environment variable substitution is deferred to getServerConfig()
// so that warnings/errors only appear for the server being accessed.

return config;
}

/**
* Get a specific server config by name
* Get a specific server config by name.
*
* Environment variables are substituted lazily here so that missing-var
* warnings are scoped to the server being queried (fixes #20).
*/
export function getServerConfig(
config: McpServersConfig,
Expand All @@ -514,7 +517,7 @@ export function getServerConfig(
const available = Object.keys(config.mcpServers);
throw new Error(formatCliError(serverNotFoundError(serverName, available)));
}
return server;
return substituteEnvVarsInObject(server);
}

/**
Expand Down