@juspay/neurolink 10.4.2 → 10.4.3

package/dist/proxy/requestLogger.js

@@ -9,15 +9,49 @@ import { join } from "path";
 import { homedir } from "os";
 import { logger } from "../utils/logger.js";
 import { chmodSync, existsSync, mkdirSync, readdirSync, rmSync, statSync, unlinkSync, } from "fs";
-import { appendFile, writeFile } from "fs/promises";
+import { writeFile } from "fs/promises";
 import { createHash } from "crypto";
 import { promisify } from "util";
 import { gzip as gzipCallback } from "zlib";
 import { OtelBridge } from "../observability/otelBridge.js";
 import { SeverityNumber } from "@opentelemetry/api-logs";
 import { configureProxyLifecycleLogger } from "./proxyLifecycle.js";
+import { withTimeout } from "../utils/async/withTimeout.js";
 let logDir = null;
 let logEnabled = false;
+const pendingLogOperations = new Set();
+const REQUEST_LOG_IO_TIMEOUT_MS = 5_000;
+function trackLogOperation(operation) {
+    pendingLogOperations.add(operation);
+    void operation.then(() => pendingLogOperations.delete(operation), () => pendingLogOperations.delete(operation));
+    return operation;
+}
+/** Wait, up to a bounded deadline, for admitted request/body writes to settle. */
+export async function flushRequestLogs(timeoutMs = REQUEST_LOG_IO_TIMEOUT_MS) {
+    const deadline = Date.now() + Math.max(1, timeoutMs);
+    while (pendingLogOperations.size > 0) {
+        const admitted = [...pendingLogOperations];
+        const remainingMs = Math.max(1, deadline - Date.now());
+        try {
+            await withTimeout(Promise.allSettled(admitted), remainingMs, `Timed out flushing ${admitted.length} proxy request log operation(s)`);
+        }
+        catch (error) {
+            for (const operation of admitted) {
+                pendingLogOperations.delete(operation);
+            }
+            throw error;
+        }
+        if (Date.now() >= deadline && pendingLogOperations.size > 0) {
+            const remaining = pendingLogOperations.size;
+            throw new Error(`Timed out flushing ${remaining} proxy request log operation(s)`);
+        }
+    }
+}
+/** @internal Test-only hook for exercising shutdown behavior without real I/O. */
+export const __requestLoggerTestHooks = {
+    pendingOperationCount: () => pendingLogOperations.size,
+    trackLogOperation,
+};
 /**
  * Lazily-resolved LoggerProvider from OTel instrumentation.
  * null = not resolved yet (will retry), LoggerProvider = resolved, false = permanently unavailable.
@@ -86,7 +120,11 @@ export async function logRequest(entry) {
     const logFile = join(logDir, `proxy-${new Date().toISOString().split("T")[0]}.jsonl`);
     const line = JSON.stringify(entry) + "\n";
     try {
-        await appendFile(logFile, line, { mode: 0o600 });
+        await trackLogOperation(writeFile(logFile, line, {
+            mode: 0o600,
+            flag: "a",
+            signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
+        }));
     }
     catch {
         // Non-fatal — don't crash proxy for logging failures
@@ -114,7 +152,11 @@ export async function logRequestAttempt(entry) {
     const logFile = join(logDir, `proxy-attempts-${new Date().toISOString().split("T")[0]}.jsonl`);
     const line = JSON.stringify(entry) + "\n";
     try {
-        await appendFile(logFile, line, { mode: 0o600 });
+        await trackLogOperation(writeFile(logFile, line, {
+            mode: 0o600,
+            flag: "a",
+            signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
+        }));
     }
     catch {
         // Non-fatal — don't crash proxy for logging failures
@@ -353,7 +395,7 @@ function collectManagedLogFiles(rootDir) {
                 continue;
             }
             const isTopLevelProxyLog = directory === rootDir &&
-                /^proxy(?:-attempts|-debug)?-.*\.jsonl$/.test(entry.name);
+                /^proxy(?:-attempts|-debug|-lifecycle)?-.*\.jsonl$/.test(entry.name);
             const isBodyArtifact = entry.name.endsWith(".json.gz") &&
                 entryPath.includes(`${join(rootDir, "bodies")}`);
             if (!isTopLevelProxyLog && !isBodyArtifact) {
@@ -427,7 +469,10 @@ async function writeBodyArtifact(entry, redactedHeaders, redactedBody, bodyTrunc
         metadata: entry.metadata,
     });
     const compressed = await gzip(payload);
-    await writeFile(bodyPath, compressed, { mode: 0o600 });
+    await writeFile(bodyPath, compressed, {
+        mode: 0o600,
+        signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
+    });
     return {
         bodyPath,
         bodySha256: sha256(redactedBody),
@@ -510,7 +555,7 @@ export async function logBodyCapture(entry) {
     const preparedBody = prepareRedactedBody(entry.body);
     let stored;
     try {
-        stored = await writeBodyArtifact(entry, redactedHeaders, preparedBody.value, preparedBody.truncated);
+        stored = await trackLogOperation(writeBodyArtifact(entry, redactedHeaders, preparedBody.value, preparedBody.truncated));
     }
     catch (writeError) {
         logger.warn("[RequestLogger] writeBodyArtifact failed, falling back to in-memory body for OTLP", { error: writeError });
@@ -518,6 +563,7 @@ export async function logBodyCapture(entry) {
             redactedBody: preparedBody.value,
             redactedBodyBytes: preparedBody.bytes,
             bodyTruncated: preparedBody.truncated,
+            bodyWriteFailed: true,
         };
     }
     const dateStr = new Date(entry.timestamp).toISOString().split("T")[0];
@@ -542,6 +588,7 @@ export async function logBodyCapture(entry) {
         redactedBodyBytes: stored.redactedBodyBytes ?? preparedBody.bytes,
         storedFileBytes: stored.storedFileBytes,
         bodyTruncated: stored.bodyTruncated ?? preparedBody.truncated,
+        bodyWriteFailed: stored.bodyWriteFailed,
         metadata: entry.metadata,
     };
     if (traceCtx) {
@@ -549,9 +596,11 @@ export async function logBodyCapture(entry) {
         indexEntry.spanId = traceCtx.spanId;
     }
     try {
-        await appendFile(logFile, JSON.stringify(indexEntry) + "\n", {
+        await trackLogOperation(writeFile(logFile, JSON.stringify(indexEntry) + "\n", {
             mode: 0o600,
-        });
+            flag: "a",
+            signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
+        }));
     }
     catch {
         // Non-fatal
@@ -623,9 +672,11 @@ export async function logStreamError(entry) {
         logEntry.spanId = traceCtx.spanId;
     }
     try {
-        await appendFile(logFile, JSON.stringify(logEntry) + "\n", {
+        await trackLogOperation(writeFile(logFile, JSON.stringify(logEntry) + "\n", {
             mode: 0o600,
-        });
+            flag: "a",
+            signal: AbortSignal.timeout(REQUEST_LOG_IO_TIMEOUT_MS),
+        }));
     }
     catch {
         // Non-fatal — don't crash proxy for logging failures
@@ -644,13 +695,16 @@ export function cleanupLogs(maxAgeDays = 7, maxSizeMb = 500) {
     try {
         const activeLogDir = logDir;
         const files = collectManagedLogFiles(activeLogDir).sort((a, b) => a.mtime - b.mtime); // oldest first
+        const currentDate = new Date().toISOString().split("T")[0];
+        const currentMetadataLogs = new Set(["proxy", "proxy-attempts", "proxy-debug", "proxy-lifecycle"].map((prefix) => join(activeLogDir, `${prefix}-${currentDate}.jsonl`)));
+        const canDelete = (file) => !currentMetadataLogs.has(file.path);
         const cutoff = Date.now() - maxAgeDays * 24 * 60 * 60 * 1000;
         let deletedCount = 0;
         let freedBytes = 0;
         // Pass 1: delete files older than maxAgeDays
         const remaining = [];
         for (const file of files) {
-            if (file.mtime < cutoff) {
+            if (file.mtime < cutoff && canDelete(file)) {
                 unlinkSync(file.path);
                 deletedCount++;
                 freedBytes += file.size;
@@ -666,8 +720,13 @@ export function cleanupLogs(maxAgeDays = 7, maxSizeMb = 500) {
         // Pass 2: if total size exceeds maxSizeMb, delete oldest until under limit
         const maxBytes = maxSizeMb * 1024 * 1024;
         let totalSize = remaining.reduce((sum, f) => sum + f.size, 0);
-        while (totalSize > maxBytes && remaining.length > 0) {
-            const oldest = remaining.shift();
+        const deletionCandidates = remaining.filter(canDelete);
+        // Current-day metadata is the only reliable source for final-request,
+        // attempt, lifecycle, and body-index reconciliation. Keep those indexes
+        // intact during size cleanup; body artifacts and older indexes remain
+        // eligible for eviction.
+        while (totalSize > maxBytes && deletionCandidates.length > 0) {
+            const oldest = deletionCandidates.shift();
             if (!oldest) {
                 break;
             }

package/dist/proxy/rollingProxyServer.js

@@ -10,8 +10,28 @@ export async function startRollingProxyServer(options) {
     let listening = false;
     let recoveryFailures = 0;
     let recoveryTimer;
+    let requestedReplacementTimer;
+    let requestedReplacementSchedule = 0;
+    let requestedReplacementPending = false;
+    let replacementQueueTail = null;
     const recoveryDelayMs = Math.max(1, options.recoveryDelayMs ?? DEFAULT_RECOVERY_DELAY_MS);
     const maxRecoveryDelayMs = Math.max(recoveryDelayMs, options.maxRecoveryDelayMs ?? DEFAULT_MAX_RECOVERY_DELAY_MS);
+    const queueReplacement = (operation) => {
+        const predecessor = replacementQueueTail;
+        const result = (predecessor ?? Promise.resolve()).then(operation);
+        const completion = result.then(() => undefined, () => undefined);
+        replacementQueueTail = completion;
+        void completion.finally(() => {
+            if (replacementQueueTail !== completion) {
+                return;
+            }
+            replacementQueueTail = null;
+            if (requestedReplacementPending) {
+                scheduleRequestedReplacement();
+            }
+        });
+        return result;
+    };
     const scheduleRecovery = () => {
         if (closing || !listening || recoveryTimer) {
             return;
@@ -23,11 +43,13 @@ export async function startRollingProxyServer(options) {
             // An explicit replace() may have started (or completed) a generation
             // while this timer was pending. Re-validate before recovering so we never
             // launch a duplicate generation that conflicts with the requested worker.
-            const snapshot = supervisor.snapshot();
-            if (closing || snapshot.active || snapshot.candidate) {
-                return;
-            }
-            void supervisor.replace(desiredVersion).then(() => {
+            void queueReplacement(async () => {
+                const snapshot = supervisor.snapshot();
+                if (closing || snapshot.active || snapshot.candidate) {
+                    return;
+                }
+                await supervisor.replace(desiredVersion);
+            }).then(() => {
                 recoveryFailures = 0;
             }, (error) => {
                 recoveryFailures += 1;
@@ -48,6 +70,38 @@ export async function startRollingProxyServer(options) {
             scheduleRecovery();
         }
     };
+    function scheduleRequestedReplacement() {
+        if (closing) {
+            return;
+        }
+        requestedReplacementPending = true;
+        if (requestedReplacementTimer || replacementQueueTail) {
+            return;
+        }
+        const schedule = ++requestedReplacementSchedule;
+        requestedReplacementTimer = setTimeout(() => {
+            requestedReplacementTimer = undefined;
+            if (schedule !== requestedReplacementSchedule) {
+                return;
+            }
+            if (closing || !supervisor.snapshot().active) {
+                return;
+            }
+            requestedReplacementPending = false;
+            const replacementVersion = desiredVersion;
+            void queueReplacement(async () => {
+                if (closing || !supervisor.snapshot().active) {
+                    return;
+                }
+                options.log?.(`[proxy-supervisor] preparing same-version worker replacement version=${replacementVersion} reason=environment`);
+                await supervisor.replace(replacementVersion);
+                options.log?.(`[proxy-supervisor] same-version worker replacement complete version=${replacementVersion} reason=environment`);
+            }).catch((error) => {
+                options.log?.(`[proxy-supervisor] same-version worker replacement failed version=${replacementVersion} reason=environment: ${error instanceof Error ? error.message : String(error)}`);
+            });
+        }, 50);
+        requestedReplacementTimer.unref?.();
+    }
     const supervisor = new RollingWorkerSupervisor({
         spawnWorker: options.spawnWorker,
         readyTimeoutMs: options.readyTimeoutMs,
@@ -55,9 +109,14 @@ export async function startRollingProxyServer(options) {
         socketQueueTimeoutMs: options.socketQueueTimeoutMs,
         shutdownTimeoutMs: options.shutdownTimeoutMs,
         onStateChange: stateChanged,
+        onReplacementRequested: scheduleRequestedReplacement,
         log: options.log,
     });
     const listener = createServer({ pauseOnConnect: true }, (socket) => {
+        // The parent keeps its descriptor until the worker commits the IPC
+        // transfer. Consume client resets during that interval so they cannot
+        // terminate the long-lived supervisor process.
+        socket.once("error", () => socket.destroy());
         supervisor.acceptSocket(socket);
     });
     await new Promise((resolve, reject) => {
@@ -89,8 +148,8 @@ export async function startRollingProxyServer(options) {
     }
     const address = listener.address();
     if (!address || typeof address === "string") {
-        listener.close();
-        void supervisor.close();
+        await new Promise((resolve) => listener.close(() => resolve()));
+        await supervisor.close().catch(() => undefined);
         throw ErrorFactory.proxyWorkerLifecycle("rolling proxy listener did not expose a TCP address");
     }
     return {
@@ -111,8 +170,14 @@ export async function startRollingProxyServer(options) {
                 clearTimeout(recoveryTimer);
                 recoveryTimer = undefined;
             }
+            if (requestedReplacementTimer) {
+                clearTimeout(requestedReplacementTimer);
+                requestedReplacementTimer = undefined;
+            }
+            requestedReplacementSchedule += 1;
+            requestedReplacementPending = false;
             try {
-                const snapshot = await supervisor.replace(expectedVersion);
+                const snapshot = await queueReplacement(() => supervisor.replace(expectedVersion));
                 recoveryFailures = 0;
                 return snapshot;
             }
@@ -139,6 +204,12 @@ export async function startRollingProxyServer(options) {
                 clearTimeout(recoveryTimer);
                 recoveryTimer = undefined;
             }
+            if (requestedReplacementTimer) {
+                clearTimeout(requestedReplacementTimer);
+                requestedReplacementTimer = undefined;
+            }
+            requestedReplacementSchedule += 1;
+            requestedReplacementPending = false;
             const listenerClosed = new Promise((resolve, reject) => {
                 listener.close((error) => (error ? reject(error) : resolve()));
             });

package/dist/proxy/rollingWorkerProcess.js

@@ -2,7 +2,7 @@ import { spawn } from "node:child_process";
 import { ErrorFactory } from "../utils/errorHandling.js";
 import { isProxyWorkerStatusMessage, PROXY_SOCKET_WORKER_ENV, } from "./rollingWorkerProtocol.js";
 export function spawnProxySocketWorker(options) {
-    const socketAckTimeoutMs = Math.max(1, options.socketAckTimeoutMs ?? 5_000);
+    const socketAckTimeoutMs = Math.max(1, options.socketAckTimeoutMs ?? 30_000);
     let nextSocketId = 0;
     const pendingSockets = new Map();
     const statusListeners = new Set();
@@ -59,6 +59,18 @@ export function spawnProxySocketWorker(options) {
         }
         pendingSockets.delete(socketId);
         clearTimeout(pending.timeout);
+        if (error && child.connected && !pending.accepted) {
+            try {
+                child.send({
+                    type: "proxy-worker:socket-cancel",
+                    generation: options.generation,
+                    socketId,
+                }, () => undefined);
+            }
+            catch {
+                // The supervisor will quarantine the worker after the failed transfer.
+            }
+        }
         if (!error) {
             pending.socket.destroy();
         }
@@ -92,9 +104,14 @@ export function spawnProxySocketWorker(options) {
             publishStatus(message);
         }
     });
-    child.once("exit", () => {
+    child.once("exit", (code, signal) => {
         for (const socketId of [...pendingSockets.keys()]) {
-            settleSocket(socketId, new Error(`proxy worker ${childPid} exited before accepting socket`));
+            settleSocket(socketId, ErrorFactory.proxyWorkerLifecycle(`proxy worker ${childPid} exited before socket transfer committed (code=${code ?? "none"}, signal=${signal ?? "none"})`, {
+                workerPid: childPid,
+                generation: options.generation,
+                exitCode: code,
+                signal,
+            }));
         }
     });
     const sendControl = (message) => {
@@ -117,18 +134,6 @@ export function spawnProxySocketWorker(options) {
             }
             const socketId = `${generation}:${++nextSocketId}`;
             const timeout = setTimeout(() => {
-                if (child.connected) {
-                    try {
-                        child.send({
-                            type: "proxy-worker:socket-cancel",
-                            generation,
-                            socketId,
-                        });
-                    }
-                    catch {
-                        // The worker is terminated after the failed transfer is reported.
-                    }
-                }
                 settleSocket(socketId, new Error(`proxy worker ${childPid} did not accept socket within ${socketAckTimeoutMs}ms`));
             }, socketAckTimeoutMs);
             timeout.unref?.();

package/dist/proxy/rollingWorkerProtocol.js

@@ -38,5 +38,8 @@ export function isProxyWorkerStatusMessage(value) {
     if (message.type === "proxy-worker:socket-accepted") {
         return typeof message.socketId === "string" && message.socketId.length > 0;
     }
+    if (message.type === "proxy-worker:replacement-requested") {
+        return message.reason === "environment";
+    }
     return (message.type === "proxy-worker:fatal" && typeof message.message === "string");
 }

package/dist/proxy/rollingWorkerSupervisor.d.ts

@@ -34,6 +34,7 @@ export declare class RollingWorkerSupervisor {
     private transferSocket;
     private handleTransferFailure;
     private rejectSocket;
+    private describeTransferError;
     private recordFailure;
     private publishState;
 }

package/dist/proxy/rollingWorkerSupervisor.js

@@ -79,7 +79,6 @@ export class RollingWorkerSupervisor {
                 ? this.replacement
                 : Promise.reject(ErrorFactory.proxyWorkerLifecycle(`worker replacement for v${this.candidate?.expectedVersion ?? "unknown"} is already in progress`, { requestedVersion: expectedVersion }));
         }
-        this.lastFailure = null;
         this.replacement = this.spawnCandidate(expectedVersion).finally(() => {
             this.replacement = null;
         });
@@ -242,6 +241,16 @@ export class RollingWorkerSupervisor {
                     }
                     return;
                 }
+                if (message.type === "proxy-worker:replacement-requested") {
+                    if (this.active?.generation === generation) {
+                        this.options.onReplacementRequested?.({
+                            generation,
+                            pid: handle.pid,
+                            reason: message.reason,
+                        });
+                    }
+                    return;
+                }
                 if (message.type === "proxy-worker:ready") {
                     if (message.version !== expectedVersion) {
                         finish(new Error(`worker ${handle.pid} reported v${message.version}; expected v${expectedVersion}`));
@@ -309,7 +318,7 @@ export class RollingWorkerSupervisor {
                     if (!this.closed) {
                         this.recordFailure(generation, expectedVersion, "runtime", `worker exited (code=${code ?? "none"}, signal=${signal ?? "none"})`);
                     }
-                    this.options.log?.(`[proxy-supervisor] active worker exited generation=${generation} pid=${handle.pid}`);
+                    this.options.log?.(`[proxy-supervisor] active worker exited generation=${generation} pid=${handle.pid} code=${code ?? "none"} signal=${signal ?? "none"}`);
                 }
                 const drained = this.draining.get(generation);
                 if (drained) {
@@ -356,23 +365,27 @@ export class RollingWorkerSupervisor {
         try {
             worker.handle.sendSocket(worker.generation, socket, (error) => {
                 if (error) {
-                    this.handleTransferFailure(worker, socket);
+                    this.handleTransferFailure(worker, socket, error);
                 }
             });
         }
-        catch {
-            this.handleTransferFailure(worker, socket);
+        catch (error) {
+            this.handleTransferFailure(worker, socket, error);
         }
     }
-    handleTransferFailure(worker, socket) {
+    handleTransferFailure(worker, socket, error) {
         this.failedTransfers += 1;
-        this.recordFailure(worker.generation, worker.version, "transfer", `worker ${worker.handle.pid} failed to accept a transferred socket`);
+        const detail = this.describeTransferError(error);
+        this.recordFailure(worker.generation, worker.version, "transfer", `worker ${worker.handle.pid} failed to accept a transferred socket: ${detail}`);
+        this.options.log?.(`[proxy-supervisor] socket transfer failed generation=${worker.generation} pid=${worker.handle.pid}: ${detail}`);
         if (this.active?.generation === worker.generation && !this.closed) {
-            // Do not let worker-side graceful shutdown call shutdown(2) on an
-            // offered-but-uncommitted duplicate descriptor.
-            worker.dispose();
-            worker.handle.terminate("SIGKILL");
             this.active = null;
+            this.draining.set(worker.generation, worker);
+            // The child may own a duplicate of an incompletely transferred socket.
+            // SIGKILL closes its descriptor without worker-side shutdown(2), after
+            // which the parent rejects its copy rather than attempting unsafe replay.
+            worker.handle.terminate("SIGKILL");
+            this.publishState();
         }
         this.rejectSocket(socket);
     }
@@ -381,6 +394,13 @@ export class RollingWorkerSupervisor {
         socket.destroy();
         this.publishState();
     }
+    describeTransferError(error) {
+        if (!(error instanceof Error)) {
+            return String(error ?? "unknown transfer failure");
+        }
+        const code = error.code;
+        return code ? `${code}: ${error.message}` : error.message;
+    }
     recordFailure(generation, version, phase, message) {
         this.lastFailure = {
             at: new Date().toISOString(),

package/dist/proxy/runtimeConfig.d.ts

@@ -10,6 +10,7 @@ export declare class ProxyRuntimeConfigStore {
     private reloadTimer;
     private configFileObserved;
     private envFileObserved;
+    private currentEnvFileHash;
     private readonly watchListener;
     private constructor();
     static create(options: ProxyRuntimeConfigStoreOptions): Promise<ProxyRuntimeConfigStore>;

package/dist/proxy/runtimeConfig.js

@@ -162,11 +162,13 @@ function assertResolvedRoutingValues(value, path = "routing") {
 async function buildCandidate(options, generation, allowMissingConfig, allowMissingEnvFile, rejectInvalidHotEnv) {
     const effectiveEnv = { ...options.baseEnv };
     let envFilePresent = false;
+    let envFileValues = {};
     if (options.envFilePath) {
         try {
-            const envContent = await readFile(options.envFilePath, "utf8");
+            const envFileContent = await readFile(options.envFilePath, "utf8");
             const { parse } = await import("dotenv");
-            Object.assign(effectiveEnv, parse(envContent));
+            envFileValues = parse(envFileContent);
+            Object.assign(effectiveEnv, envFileValues);
             envFilePresent = true;
         }
         catch (error) {
@@ -218,6 +220,12 @@ async function buildCandidate(options, generation, allowMissingConfig, allowMiss
             accountAllowlist: routing.accountAllowlist,
         })
         : undefined;
+    const envFileHash = createHash("sha256")
+        .update(envFilePresent
+        ? JSON.stringify(Object.entries(envFileValues).sort(([left], [right]) => left < right ? -1 : left > right ? 1 : 0))
+        : "[missing]")
+        .digest("hex")
+        .slice(0, 16);
     const fingerprintSource = JSON.stringify({
         strategy,
         passthrough: options.passthrough,
@@ -249,6 +257,7 @@ async function buildCandidate(options, generation, allowMissingConfig, allowMiss
         }),
         configFilePresent,
         envFilePresent,
+        envFileHash,
     };
 }
 /** Atomic last-known-good runtime configuration with file-triggered reloads. */
@@ -262,6 +271,7 @@ export class ProxyRuntimeConfigStore {
     reloadTimer;
     configFileObserved;
     envFileObserved;
+    currentEnvFileHash;
     watchListener = (current, previous) => {
         if (current.mtimeMs === previous.mtimeMs &&
             current.size === previous.size &&
@@ -270,11 +280,12 @@ export class ProxyRuntimeConfigStore {
         }
         this.scheduleWatchReload();
     };
-    constructor(options, snapshot, configFileObserved, envFileObserved) {
+    constructor(options, snapshot, configFileObserved, envFileObserved, envFileHash) {
         this.options = { ...options, baseEnv: { ...options.baseEnv } };
         this.currentSnapshot = snapshot;
         this.configFileObserved = configFileObserved;
         this.envFileObserved = envFileObserved;
+        this.currentEnvFileHash = envFileHash;
         this.status = {
             configPath: options.configPath,
             ...(options.envFilePath ? { envFilePath: options.envFilePath } : {}),
@@ -287,7 +298,7 @@ export class ProxyRuntimeConfigStore {
     }
     static async create(options) {
         const candidate = await buildCandidate(options, 1, true, true, false);
-        return new ProxyRuntimeConfigStore(options, candidate.snapshot, candidate.configFilePresent, candidate.envFilePresent);
+        return new ProxyRuntimeConfigStore(options, candidate.snapshot, candidate.configFilePresent, candidate.envFilePresent, candidate.envFileHash);
     }
     getSnapshot() {
         return this.currentSnapshot;
@@ -354,7 +365,8 @@ export class ProxyRuntimeConfigStore {
             const candidate = await buildCandidate(this.options, this.currentSnapshot.generation + 1, !this.configFileObserved, !this.envFileObserved, true);
             this.configFileObserved ||= candidate.configFilePresent;
             this.envFileObserved ||= candidate.envFilePresent;
-            if (candidate.snapshot.configHash === this.currentSnapshot.configHash) {
+            if (candidate.snapshot.configHash === this.currentSnapshot.configHash &&
+                candidate.envFileHash === this.currentEnvFileHash) {
                 this.status = {
                     ...this.status,
                     lastReloadAt: attemptedAt,
@@ -369,7 +381,9 @@ export class ProxyRuntimeConfigStore {
                 this.notifyReloadListeners(result);
                 return result;
             }
+            const environmentChanged = candidate.envFileHash !== this.currentEnvFileHash;
             this.currentSnapshot = candidate.snapshot;
+            this.currentEnvFileHash = candidate.envFileHash;
             this.status = {
                 ...this.status,
                 generation: candidate.snapshot.generation,
@@ -392,6 +406,7 @@ export class ProxyRuntimeConfigStore {
                 applied: true,
                 changed: true,
                 generation: candidate.snapshot.generation,
+                ...(environmentChanged ? { environmentChanged: true } : {}),
             };
             this.notifyReloadListeners(result);
             return result;