fix(setup): preserve configured MCP server environment (#1607)

* fix(setup): preserve configured MCP server environment

* fix(setup): validate retained server environment before writes
This commit is contained in:
Feng
2026-10-11 06:23:02 +08:00
committed by GitHub
parent 3e931a7e35
commit 52331ab637
8 changed files with 479 additions and 32 deletions
+24 -26
View File
@@ -11,12 +11,12 @@ import {
serializeClientConfiguration,
withClientServers,
type ClientConfigurationDocument,
type ClientRegistrationDialect,
} from "./ClientConfigurationDocument.js";
import { constants as fsConstants } from "node:fs";
import { copyFile, mkdir, rm, writeFile } from "node:fs/promises";
import { dirname } from "node:path";
import writeFileAtomic from "write-file-atomic";
import { clientRegistrationEnvironment } from "./ClientRegistrationEnvironment.js";
import { PRODUCT_IDENTITY } from "../identity.js";
import { npxRegistrationCommand } from "./ClientRegistrationIdentity.js";
@@ -54,7 +54,12 @@ const configureClientDocument = async (
const policy = await readClientPolicyBlock(
client,
undefined,
clientConfigurationDesired(client, environment, command, client.format),
clientConfigurationDesired(
client,
environment,
command,
files.value.at(-1),
),
);
if (!policy.ok || policy.value !== undefined)
return { status: "failed", reason: "readback" };
@@ -78,7 +83,7 @@ const configureClientDocument = async (
const policy = await readClientPolicyBlock(
client,
parsed,
clientConfigurationDesired(client, environment, command, parsed.dialect),
clientConfigurationDesired(client, environment, command, parsed),
);
if (!policy.ok || policy.value !== undefined)
return { status: "failed", reason: "readback" };
@@ -91,7 +96,7 @@ const configureClientDocument = async (
client,
environment,
command,
parsed.dialect,
parsed,
);
if (registrationCurrent(parsed, desired)) return { status: "unchanged" };
const backupPath =
@@ -184,12 +189,7 @@ export const clientConfigurationAligned = async (
const policy = await readClientPolicyBlock(
client,
parsed,
clientConfigurationDesired(
client,
providerEnvironment,
command,
parsed.dialect,
),
clientConfigurationDesired(client, providerEnvironment, command, parsed),
);
return (
policy.ok &&
@@ -200,7 +200,7 @@ export const clientConfigurationAligned = async (
client,
providerEnvironment,
command,
parsed.dialect,
parsed,
),
)
);
@@ -229,7 +229,7 @@ export const inspectClientConfiguration = async (
client,
providerEnvironment,
command,
client.format,
files.value.at(-1),
),
);
if (!policy.ok)
@@ -261,12 +261,7 @@ export const inspectClientConfiguration = async (
const policy = await readClientPolicyBlock(
client,
parsed,
clientConfigurationDesired(
client,
providerEnvironment,
command,
parsed.dialect,
),
clientConfigurationDesired(client, providerEnvironment, command, parsed),
);
if (!policy.ok)
return { status: "invalid", remediation: policy.error.detail };
@@ -276,7 +271,7 @@ export const inspectClientConfiguration = async (
client,
providerEnvironment,
command,
parsed.dialect,
parsed,
);
if (registrationCurrent(parsed, desired))
return { status: "already_current" };
@@ -338,17 +333,20 @@ const clientConfigurationDesired = (
client: SetupClient,
providerEnvironment: SetupProviderEnvironment,
command: readonly string[],
format: ClientRegistrationDialect | undefined,
parsed?: ClientConfigurationDocument,
) => {
const environment = Object.fromEntries(
Object.entries(providerEnvironment).sort(([left], [right]) =>
left.localeCompare(right),
),
const format = parsed?.dialect ?? client.format ?? "json";
// Preserve explicitly configured server settings, never the ambient process
// environment. Newly discovered provider paths win only for their own keys.
const environment = clientRegistrationEnvironment(
parsed,
providerEnvironment,
);
if (!environment.ok) throw environment.error;
const registration = clientRegistrationEntry(
format ?? "json",
format,
command.length === 0 ? [PRODUCT_IDENTITY.cliBinary, "mcp"] : command,
environment,
environment.value,
);
return {
...registration,