fix(setup): preserve Windows environment override identity (#4946)
* fix(setup): preserve Windows environment override identity * fix(setup): preserve selected platform and YAML alias metadata * fix(setup): reconcile layered environment and projected YAML identities
This commit is contained in:
1 parent
afde435c94
commit
e84468c0bb
11 files changed
+562
-44
No files matched your search
@@ -12,6 +12,8 @@ import type { SetupClient } from "./SupportedClients.js";
|
||||
import { clientRegistrationEnvironment } from "./ClientRegistrationEnvironment.js";
|
||||
import type { ArtifactResourceScope } from "../artifacts/ArtifactResourceScope.js";
|
||||
import type { ConfigurationError } from "../domain/configurationErrors.js";
|
||||
import { mergeEnvironmentOverrides } from "../process/snapshotEnvironment.js";
|
||||
import { PRODUCT_IDENTITY } from "../identity.js";
|
||||
|
||||
/** A parsed layer retains its path so rereading the write target replaces only that layer. */
|
||||
export interface ClientConfigurationSource extends ClientConfigurationDocument {
|
||||
@@ -88,6 +90,7 @@ export const readConfigurationFile = async (
|
||||
export const readClientConfigurationFiles = async (
|
||||
client: SetupClient,
|
||||
resources?: ArtifactResourceScope,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Promise<
|
||||
Result<readonly ClientConfigurationSource[], ClientConfigurationFileError>
|
||||
> => {
|
||||
@@ -104,6 +107,7 @@ export const readClientConfigurationFiles = async (
|
||||
document.value,
|
||||
{},
|
||||
"fragment",
|
||||
platform,
|
||||
);
|
||||
if (!environment.ok)
|
||||
return err(invalidEnvironment(path, environment.error));
|
||||
@@ -111,7 +115,10 @@ export const readClientConfigurationFiles = async (
|
||||
}
|
||||
}
|
||||
const environment = clientRegistrationEnvironment(
|
||||
effectiveClientConfiguration(documents),
|
||||
effectiveClientConfiguration(documents, undefined, platform),
|
||||
{},
|
||||
"effective",
|
||||
platform,
|
||||
);
|
||||
if (!environment.ok)
|
||||
return err(invalidEnvironment(client.configPath, environment.error));
|
||||
@@ -142,6 +149,7 @@ export const effectiveClientConfiguration = (
|
||||
readonly client: Pick<SetupClient, "configPath" | "configPaths">;
|
||||
readonly document: ClientConfigurationDocument | undefined;
|
||||
},
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): ClientConfigurationDocument | undefined => {
|
||||
const documents =
|
||||
target === undefined
|
||||
@@ -164,11 +172,28 @@ export const effectiveClientConfiguration = (
|
||||
...Object.keys(document.legacyServers),
|
||||
...Object.keys(document.servers),
|
||||
]);
|
||||
for (const name of names)
|
||||
servers[name] = mergeConfigurationValue(
|
||||
servers[name],
|
||||
effectiveClientServer(document, name),
|
||||
);
|
||||
for (const name of names) {
|
||||
const previous = servers[name];
|
||||
const next = effectiveClientServer(document, name);
|
||||
const merged = mergeConfigurationValue(previous, next);
|
||||
const key =
|
||||
document.dialect === "opencode" || document.dialect === "opencode_v2"
|
||||
? "environment"
|
||||
: "env";
|
||||
if (
|
||||
name === PRODUCT_IDENTITY.mcpServerKey &&
|
||||
isObject(merged) &&
|
||||
isObject(merged[key])
|
||||
) {
|
||||
const before =
|
||||
isObject(previous) && isObject(previous[key]) ? previous[key] : {};
|
||||
const after = isObject(next) && isObject(next[key]) ? next[key] : {};
|
||||
servers[name] = {
|
||||
...merged,
|
||||
[key]: mergeEnvironmentOverrides(before, after, platform),
|
||||
};
|
||||
} else servers[name] = merged;
|
||||
}
|
||||
}
|
||||
return { ...last, servers, legacyServers: {} };
|
||||
};
|
||||
@@ -177,6 +202,7 @@ export const effectiveClientConfiguration = (
|
||||
export const readEffectiveClientRegistrationConfiguration = async (
|
||||
client: SetupClient,
|
||||
resources?: ArtifactResourceScope,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Promise<
|
||||
Result<
|
||||
{
|
||||
@@ -186,9 +212,17 @@ export const readEffectiveClientRegistrationConfiguration = async (
|
||||
ClientConfigurationFileError
|
||||
>
|
||||
> => {
|
||||
const nativeSources = await readClientConfigurationFiles(client, resources);
|
||||
const nativeSources = await readClientConfigurationFiles(
|
||||
client,
|
||||
resources,
|
||||
platform,
|
||||
);
|
||||
if (!nativeSources.ok) return nativeSources;
|
||||
const nativeDocument = effectiveClientConfiguration(nativeSources.value);
|
||||
const nativeDocument = effectiveClientConfiguration(
|
||||
nativeSources.value,
|
||||
undefined,
|
||||
platform,
|
||||
);
|
||||
const fallbackPath =
|
||||
client.format === "zcode" ? client.zcodeFallbackPath : undefined;
|
||||
if (
|
||||
@@ -207,9 +241,14 @@ export const readEffectiveClientRegistrationConfiguration = async (
|
||||
const fallbackSources = await readClientConfigurationFiles(
|
||||
fallbackClient,
|
||||
resources,
|
||||
platform,
|
||||
);
|
||||
if (!fallbackSources.ok) return fallbackSources;
|
||||
const fallbackDocument = effectiveClientConfiguration(fallbackSources.value);
|
||||
const fallbackDocument = effectiveClientConfiguration(
|
||||
fallbackSources.value,
|
||||
undefined,
|
||||
platform,
|
||||
);
|
||||
return ok(
|
||||
fallbackDocument === undefined
|
||||
? { document: nativeDocument, configPath: client.configPath }
|
||||
|
||||
@@ -12,6 +12,10 @@ import {
|
||||
} from "./ClientConfigurationDocument.js";
|
||||
import { PRODUCT_IDENTITY } from "../identity.js";
|
||||
import { compareUnicodeCodePoints } from "../domain/unicodeCodePointOrder.js";
|
||||
import {
|
||||
mergeEnvironmentOverrides,
|
||||
snapshotEnvironment,
|
||||
} from "../process/snapshotEnvironment.js";
|
||||
import { dshDocument } from "./DshCordisPatch.js";
|
||||
import type { McpToolTimeoutInputs } from "../mcpStartupPolicy.js";
|
||||
import type { AnalysisProviderSelector } from "../contracts/providerSelection.js";
|
||||
@@ -31,13 +35,20 @@ export const clientRegistrationEnvironment = (
|
||||
parsed: ClientConfigurationDocument | undefined,
|
||||
overrides: Readonly<Record<string, string>> = {},
|
||||
validation: "fragment" | "effective" = "effective",
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Result<Readonly<Record<string, string>>, ConfigurationError> => {
|
||||
if (parsed?.dialect === "dsh")
|
||||
return dshDocument(parsed.document).environment(overrides, validation);
|
||||
return dshDocument(parsed.document).environment(
|
||||
overrides,
|
||||
validation,
|
||||
platform,
|
||||
);
|
||||
const details = clientRegistrationEnvironmentDetails(
|
||||
parsed,
|
||||
overrides,
|
||||
validation,
|
||||
undefined,
|
||||
platform,
|
||||
);
|
||||
return details.ok ? ok(details.value.values) : details;
|
||||
};
|
||||
@@ -48,17 +59,20 @@ export const clientRegistrationEnvironmentDetails = (
|
||||
overrides: Readonly<Record<string, string>> = {},
|
||||
validation: "fragment" | "effective" = "effective",
|
||||
resolveProviderRequestBudget?: ProviderRequestBudgetResolver,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Result<ClientRegistrationEnvironmentDetails, ConfigurationError> => {
|
||||
if (parsed?.dialect === "dsh") {
|
||||
const environment = dshDocument(parsed.document).environment(
|
||||
overrides,
|
||||
validation,
|
||||
platform,
|
||||
);
|
||||
if (!environment.ok) return environment;
|
||||
return validatedDetails(
|
||||
environment.value,
|
||||
validation,
|
||||
resolveProviderRequestBudget,
|
||||
platform,
|
||||
);
|
||||
}
|
||||
const key =
|
||||
@@ -88,11 +102,16 @@ export const clientRegistrationEnvironmentDetails = (
|
||||
);
|
||||
// Validate known settings with the runtime's parser, but retain the original
|
||||
// string overrides, including unknown client-specific keys and no defaults.
|
||||
const environment = { ...existing.data, ...overrides };
|
||||
const environment = mergeEnvironmentOverrides(
|
||||
existing.data,
|
||||
overrides,
|
||||
platform,
|
||||
);
|
||||
return validatedDetails(
|
||||
environment,
|
||||
validation,
|
||||
resolveProviderRequestBudget,
|
||||
platform,
|
||||
);
|
||||
};
|
||||
|
||||
@@ -100,16 +119,18 @@ const validatedDetails = (
|
||||
environment: Readonly<Record<string, string>>,
|
||||
validation: "fragment" | "effective",
|
||||
resolveProviderRequestBudget?: ProviderRequestBudgetResolver,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Result<ClientRegistrationEnvironmentDetails, ConfigurationError> => {
|
||||
const runtimeEnvironment = snapshotEnvironment(environment, platform);
|
||||
const validated =
|
||||
validation === "fragment"
|
||||
? parseEnvironmentValues(environment)
|
||||
: parseEnvironment(environment);
|
||||
? parseEnvironmentValues(runtimeEnvironment)
|
||||
: parseEnvironment(runtimeEnvironment);
|
||||
if (!validated.ok) return validated;
|
||||
const providerRequestBudget =
|
||||
resolveProviderRequestBudget?.(
|
||||
validated.value.REA_ANALYSIS_PROVIDER,
|
||||
environment,
|
||||
runtimeEnvironment,
|
||||
) ?? ok(undefined);
|
||||
if (!providerRequestBudget.ok) return providerRequestBudget;
|
||||
return ok({
|
||||
|
||||
@@ -15,6 +15,7 @@ import { valid } from "semver";
|
||||
|
||||
import { RegularFileCleanupFailure } from "./RegularFileRead.js";
|
||||
import { PRODUCT_IDENTITY } from "../identity.js";
|
||||
import { snapshotEnvironment } from "../process/snapshotEnvironment.js";
|
||||
import { CURRENT_ENTRYPOINT_PATH } from "../process/CurrentEntrypointPath.js";
|
||||
import {
|
||||
MCP_STARTUP_POLICY,
|
||||
@@ -185,6 +186,7 @@ export const readClientRegistrationInspections = async (
|
||||
const configuration = await readEffectiveClientRegistrationConfiguration(
|
||||
client,
|
||||
options.resources,
|
||||
options.platform,
|
||||
);
|
||||
if (!configuration.ok) {
|
||||
if (
|
||||
@@ -265,6 +267,7 @@ export const readClientRegistrationInspections = async (
|
||||
{},
|
||||
"effective",
|
||||
options.resolveProviderRequestBudget,
|
||||
options.platform,
|
||||
)
|
||||
: undefined;
|
||||
if (
|
||||
@@ -297,8 +300,10 @@ export const readClientRegistrationInspections = async (
|
||||
platform: options.platform ?? process.platform,
|
||||
kimiInputSchemaProfileSelected:
|
||||
registrationEnvironment?.ok === true &&
|
||||
registrationEnvironment.value.values.REA_MCP_INPUT_SCHEMA_PROFILE !==
|
||||
undefined,
|
||||
snapshotEnvironment(
|
||||
registrationEnvironment.value.values,
|
||||
options.platform,
|
||||
).REA_MCP_INPUT_SCHEMA_PROFILE !== undefined,
|
||||
});
|
||||
record(
|
||||
configuredStatus(
|
||||
|
||||
@@ -7,6 +7,10 @@ import { ConfigurationError } from "../domain/configurationErrors.js";
|
||||
import { err, ok, type Result } from "../domain/result.js";
|
||||
import type { ClientConfigurationDocument } from "./ClientConfigurationDocument.js";
|
||||
import { CordisExpression, DshCordisYaml } from "./DshCordisYaml.js";
|
||||
import {
|
||||
mergeEnvironmentOverrides,
|
||||
snapshotEnvironment,
|
||||
} from "../process/snapshotEnvironment.js";
|
||||
|
||||
export const DSH_ENTRY_ID = "rea-mcp";
|
||||
export const DSH_CLIENT_PACKAGE = "@deepseek-ai/dsh-mcp-client";
|
||||
@@ -185,6 +189,7 @@ export class DshCordisDocument {
|
||||
environment(
|
||||
overrides: Readonly<Record<string, string>> = {},
|
||||
validation: "fragment" | "effective" = "effective",
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Result<Readonly<Record<string, string>>, ConfigurationError> {
|
||||
const config = this.#field("config");
|
||||
if (config instanceof CordisExpression)
|
||||
@@ -220,9 +225,11 @@ export class DshCordisDocument {
|
||||
);
|
||||
const literals: Record<string, string> = {};
|
||||
const unresolvedSettings = new Set<string>();
|
||||
for (const [key, value] of Object.entries(raw ?? {})) {
|
||||
for (const [key, value] of Object.entries(
|
||||
mergeEnvironmentOverrides<unknown>(raw ?? {}, overrides, platform),
|
||||
)) {
|
||||
if (value instanceof CordisExpression) {
|
||||
if (overrides[key] === undefined) unresolvedSettings.add(key);
|
||||
unresolvedSettings.add(key);
|
||||
continue;
|
||||
}
|
||||
if (typeof value !== "string")
|
||||
@@ -239,11 +246,20 @@ export class DshCordisDocument {
|
||||
);
|
||||
literals[key] = value;
|
||||
}
|
||||
const environment = { ...literals, ...overrides };
|
||||
const environment = literals;
|
||||
const runtimeEnvironment = snapshotEnvironment(environment, platform);
|
||||
const unresolved = new Set(
|
||||
Object.keys(
|
||||
snapshotEnvironment(
|
||||
Object.fromEntries([...unresolvedSettings].map((key) => [key, ""])),
|
||||
platform,
|
||||
),
|
||||
),
|
||||
);
|
||||
const validated =
|
||||
validation === "fragment"
|
||||
? parseEnvironmentValues(environment, unresolvedSettings)
|
||||
: parseEnvironment(environment, unresolvedSettings);
|
||||
? parseEnvironmentValues(runtimeEnvironment, unresolved)
|
||||
: parseEnvironment(runtimeEnvironment, unresolved);
|
||||
return validated.ok ? ok(environment) : validated;
|
||||
}
|
||||
|
||||
@@ -255,10 +271,10 @@ export class DshCordisDocument {
|
||||
return err(this.#editabilityError);
|
||||
const environment = this.environment(overrides);
|
||||
if (!environment.ok) return environment;
|
||||
const env = {
|
||||
...(isRecord(this.config?.env) ? this.config.env : {}),
|
||||
...overrides,
|
||||
};
|
||||
const env = mergeEnvironmentOverrides<unknown>(
|
||||
isRecord(this.config?.env) ? this.config.env : {},
|
||||
overrides,
|
||||
);
|
||||
const desired = { ...this.config, ...dshClientRegistrationEntry(command) };
|
||||
delete desired.env;
|
||||
if (Object.keys(env).length > 0) desired.env = env;
|
||||
@@ -373,6 +389,21 @@ export class DshCordisDocument {
|
||||
: this.#yaml.detach(env, invalidated);
|
||||
if (!isMap(nextEnv))
|
||||
throw new ConfigurationError("Cordis environment is not a mapping");
|
||||
for (const pair of [...nextEnv.items]) {
|
||||
const key = this.#yaml.key(pair.key);
|
||||
if (Object.hasOwn(desiredEnv, key)) {
|
||||
this.#yaml.renameKey(nextEnv, pair, key);
|
||||
continue;
|
||||
}
|
||||
const alias =
|
||||
process.platform === "win32"
|
||||
? Object.keys(desiredEnv).find(
|
||||
(name) => name.toUpperCase() === key.toUpperCase(),
|
||||
)
|
||||
: undefined;
|
||||
if (alias === undefined) nextEnv.delete(pair.key);
|
||||
else this.#yaml.renameKey(nextEnv, pair, alias);
|
||||
}
|
||||
for (const [key, value] of Object.entries(desiredEnv)) {
|
||||
this.#yaml.setValue(nextEnv, key, value);
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import {
|
||||
type Document,
|
||||
type Node,
|
||||
type YAMLMap,
|
||||
type Pair,
|
||||
} from "yaml";
|
||||
import { ConfigurationError } from "../domain/configurationErrors.js";
|
||||
|
||||
@@ -82,7 +83,7 @@ export class DshCordisYaml {
|
||||
else if (isMap(resolved)) {
|
||||
const entries: [string, unknown][] = [];
|
||||
for (const pair of resolved.items) {
|
||||
entries.push([this.#key(pair.key), this.value(pair.value)]);
|
||||
entries.push([this.key(pair.key), this.value(pair.value)]);
|
||||
}
|
||||
value = Object.fromEntries(entries);
|
||||
}
|
||||
@@ -91,7 +92,7 @@ export class DshCordisYaml {
|
||||
return value;
|
||||
}
|
||||
|
||||
#key(node: unknown): string {
|
||||
key(node: unknown): string {
|
||||
const key = this.value(node);
|
||||
if (typeof key === "object" && key !== null)
|
||||
throw new ConfigurationError(
|
||||
@@ -101,13 +102,40 @@ export class DshCordisYaml {
|
||||
return key === null ? "" : String(key);
|
||||
}
|
||||
|
||||
/** A case-only rename retains source key/value comments on the chosen alias. */
|
||||
renameKey(map: YAMLMap, pair: Pair, key: string): void {
|
||||
const existing = map.items.find(
|
||||
(item) => item !== pair && this.key(item.key) === key,
|
||||
);
|
||||
const replacement = existing ?? pair;
|
||||
const carry = (source: unknown, target: unknown): void => {
|
||||
if (!isNode(source) || !isNode(target) || source === target) return;
|
||||
for (const name of ["comment", "commentBefore"] as const) {
|
||||
const values = [target[name], source[name]].filter(
|
||||
(value): value is string => value !== undefined,
|
||||
);
|
||||
if (values.length > 0) target[name] = [...new Set(values)].join("\n");
|
||||
}
|
||||
};
|
||||
if (existing !== undefined) {
|
||||
carry(pair.key, existing.key);
|
||||
carry(pair.value, existing.value);
|
||||
map.items = map.items.filter((item) => item !== pair);
|
||||
} else if (this.key(pair.key) !== key) {
|
||||
const renamed = this.document.createNode(key);
|
||||
carry(pair.key, renamed);
|
||||
replacement.key = renamed;
|
||||
}
|
||||
}
|
||||
|
||||
field(map: YAMLMap | undefined, key: string): unknown {
|
||||
return map?.items.findLast((pair) => this.#key(pair.key) === key)?.value;
|
||||
return map?.items.findLast((pair) => this.key(pair.key) === key)?.value;
|
||||
}
|
||||
|
||||
/** Preserve unchanged nodes and carry their comments when replacing values. */
|
||||
setValue(map: YAMLMap, key: string, value: unknown): void {
|
||||
const original = this.field(map, key);
|
||||
const pair = map.items.findLast((item) => this.key(item.key) === key);
|
||||
const original = pair?.value;
|
||||
if (isDeepStrictEqual(this.value(original), value)) return;
|
||||
const replacement = this.document.createNode(value);
|
||||
if (isNode(original) && isNode(replacement)) {
|
||||
@@ -116,7 +144,8 @@ export class DshCordisYaml {
|
||||
if (original.commentBefore !== undefined)
|
||||
replacement.commentBefore = original.commentBefore;
|
||||
}
|
||||
map.set(key, replacement);
|
||||
if (pair === undefined) map.set(key, replacement);
|
||||
else pair.value = replacement;
|
||||
}
|
||||
|
||||
/** Copy from the source before edits; materialized nodes own no anchors. */
|
||||
|
||||
@@ -32,6 +32,7 @@ import {
|
||||
} from "./ClientRegistrationEnvironment.js";
|
||||
|
||||
import { PRODUCT_IDENTITY } from "../identity.js";
|
||||
import { snapshotEnvironment } from "../process/snapshotEnvironment.js";
|
||||
import { npxRegistrationCommand } from "./ClientRegistrationIdentity.js";
|
||||
import {
|
||||
MCP_STARTUP_POLICY,
|
||||
@@ -761,7 +762,8 @@ const clientConfigurationDesired = (
|
||||
if (!environment.ok) throw environment.error;
|
||||
const registrationEnvironment =
|
||||
client.name === "kimi" &&
|
||||
environment.value.REA_MCP_INPUT_SCHEMA_PROFILE === undefined
|
||||
snapshotEnvironment(environment.value).REA_MCP_INPUT_SCHEMA_PROFILE ===
|
||||
undefined
|
||||
? {
|
||||
...environment.value,
|
||||
REA_MCP_INPUT_SCHEMA_PROFILE: "compact",
|
||||
|
||||
@@ -1,6 +1,33 @@
|
||||
import { expect, it } from "vitest";
|
||||
|
||||
import { snapshotEnvironment } from "./snapshotEnvironment.js";
|
||||
import {
|
||||
mergeEnvironmentOverrides,
|
||||
snapshotEnvironment,
|
||||
} from "./snapshotEnvironment.js";
|
||||
|
||||
it.each(["win32", "linux", "darwin"] as const)(
|
||||
"merges explicit environment layers using %s key identity before sorting",
|
||||
(platform) => {
|
||||
const existing = {
|
||||
rea_analysis_provider: "hopper",
|
||||
CallerSetting: "retain",
|
||||
};
|
||||
const overrides = { REA_ANALYSIS_PROVIDER: "ghidra", Path: "chosen" };
|
||||
const merged = mergeEnvironmentOverrides(existing, overrides, platform);
|
||||
expect(merged).toEqual(
|
||||
platform === "win32"
|
||||
? {
|
||||
REA_ANALYSIS_PROVIDER: "ghidra",
|
||||
CallerSetting: "retain",
|
||||
Path: "chosen",
|
||||
}
|
||||
: { ...existing, ...overrides },
|
||||
);
|
||||
expect(Object.isFrozen(merged)).toBe(true);
|
||||
expect(existing.rea_analysis_provider).toBe("hopper");
|
||||
expect(overrides.REA_ANALYSIS_PROVIDER).toBe("ghidra");
|
||||
},
|
||||
);
|
||||
|
||||
it.each(["linux", "darwin"] as const)(
|
||||
"preserves case-sensitive %s variables in an immutable snapshot",
|
||||
|
||||
@@ -1,16 +1,33 @@
|
||||
/** Snapshot selected variables while preserving platform and caller precedence. */
|
||||
export const snapshotEnvironment = (
|
||||
environment: Readonly<NodeJS.ProcessEnv>,
|
||||
/** Merge explicit layers by platform identity while retaining the winning spelling/value. */
|
||||
export const mergeEnvironmentOverrides = <T>(
|
||||
existing: Readonly<Record<string, T>>,
|
||||
overrides: Readonly<Record<string, T>>,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Readonly<NodeJS.ProcessEnv> => {
|
||||
if (platform !== "win32") return Object.freeze({ ...environment });
|
||||
const selected = new Map<string, string | undefined>();
|
||||
): Readonly<Record<string, T>> => {
|
||||
const selected = new Map<string, readonly [string, T]>();
|
||||
for (const layer of [existing, overrides])
|
||||
for (const [key, value] of Object.entries(layer))
|
||||
selected.set(platform === "win32" ? key.toUpperCase() : key, [
|
||||
key,
|
||||
value,
|
||||
]);
|
||||
return Object.freeze(Object.fromEntries(selected.values()));
|
||||
};
|
||||
|
||||
/** Snapshot selected variables while preserving platform and caller precedence. */
|
||||
export const snapshotEnvironment = <T extends string | undefined>(
|
||||
environment: Readonly<Record<string, T>>,
|
||||
platform: NodeJS.Platform = process.platform,
|
||||
): Readonly<Record<string, T>> => {
|
||||
const selected = mergeEnvironmentOverrides({}, environment, platform);
|
||||
if (platform !== "win32") return selected;
|
||||
// Fold aliases in caller order so an explicit later override wins before
|
||||
// this canonical environment crosses a Windows process boundary.
|
||||
for (const [key, value] of Object.entries(environment))
|
||||
selected.set(key.toUpperCase(), value);
|
||||
const snapshot: NodeJS.ProcessEnv = {};
|
||||
for (const key of [...selected.keys()].sort())
|
||||
snapshot[key] = selected.get(key);
|
||||
return Object.freeze(snapshot);
|
||||
return Object.freeze(
|
||||
Object.fromEntries(
|
||||
Object.entries(selected)
|
||||
.map(([key, value]) => [key.toUpperCase(), value] as const)
|
||||
.sort(([left], [right]) => (left < right ? -1 : left > right ? 1 : 0)),
|
||||
),
|
||||
);
|
||||
};
|
||||
Reference in new issue
Block a user