From 387ef7ebc48b7743bd2b6d8e2a3262973ff9bc48 Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Wed, 24 Jun 2026 20:10:42 +0100
Subject: [PATCH] fix: route install env test mutations

---
 test/test-env.test.ts | 55 ++++++++++++++++++++++---------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/test/test-env.test.ts b/test/test-env.test.ts
index 6207311f11fe..1e7bb416d8c4 100644
--- a/test/test-env.test.ts
+++ b/test/test-env.test.ts
@@ -3,6 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { importFreshModule } from "openclaw/plugin-sdk/test-fixtures";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { deleteTestEnvValue, setTestEnvValue } from "../src/test-utils/env.js";
 import { cleanupTempDirs, makeTempDir } from "./helpers/temp-dir.js";
 import { installTestEnv } from "./test-env.js";
 
@@ -14,14 +15,14 @@ const cleanupFns: Array<() => void> = [];
 function restoreProcessEnv(): void {
   for (const key of Object.keys(process.env)) {
     if (!(key in ORIGINAL_ENV)) {
-      delete process.env[key];
+      deleteTestEnvValue(key);
     }
   }
   for (const [key, value] of Object.entries(ORIGINAL_ENV)) {
     if (value === undefined) {
-      delete process.env[key];
+      deleteTestEnvValue(key);
     } else {
-      process.env[key] = value;
+      setTestEnvValue(key, value);
     }
   }
 }
@@ -133,13 +134,13 @@ describe("installTestEnv", () => {
       "session\n",
     );
 
-    process.env.HOME = realHome;
-    process.env.USERPROFILE = realHome;
-    process.env.OPENCLAW_LIVE_TEST = "1";
-    process.env.OPENCLAW_LIVE_TEST_QUIET = "1";
-    process.env.OPENCLAW_CONFIG_PATH = "~/custom-openclaw.json5";
-    process.env.OPENCLAW_TEST_HOME = priorIsolatedHome;
-    process.env.OPENCLAW_STATE_DIR = path.join(priorIsolatedHome, ".openclaw");
+    setTestEnvValue("HOME", realHome);
+    setTestEnvValue("USERPROFILE", realHome);
+    setTestEnvValue("OPENCLAW_LIVE_TEST", "1");
+    setTestEnvValue("OPENCLAW_LIVE_TEST_QUIET", "1");
+    setTestEnvValue("OPENCLAW_CONFIG_PATH", "~/custom-openclaw.json5");
+    setTestEnvValue("OPENCLAW_TEST_HOME", priorIsolatedHome);
+    setTestEnvValue("OPENCLAW_STATE_DIR", path.join(priorIsolatedHome, ".openclaw"));
 
     const testEnv = installTestEnv();
     cleanupFns.push(testEnv.cleanup);
@@ -219,11 +220,11 @@ describe("installTestEnv", () => {
     const realHome = createTempHome();
     writeFile(path.join(realHome, ".profile"), "export TEST_PROFILE_ONLY=from-profile\n");
 
-    process.env.HOME = realHome;
-    process.env.USERPROFILE = realHome;
-    process.env.OPENCLAW_LIVE_TEST = "1";
-    process.env.OPENCLAW_LIVE_USE_REAL_HOME = "1";
-    process.env.OPENCLAW_LIVE_TEST_QUIET = "1";
+    setTestEnvValue("HOME", realHome);
+    setTestEnvValue("USERPROFILE", realHome);
+    setTestEnvValue("OPENCLAW_LIVE_TEST", "1");
+    setTestEnvValue("OPENCLAW_LIVE_USE_REAL_HOME", "1");
+    setTestEnvValue("OPENCLAW_LIVE_TEST_QUIET", "1");
 
     const testEnv = installTestEnv();
 
@@ -236,13 +237,13 @@ describe("installTestEnv", () => {
     const realHome = createTempHome();
     writeFile(path.join(realHome, ".profile"), "export TEST_PROFILE_ONLY=from-profile\n");
 
-    process.env.HOME = realHome;
-    process.env.USERPROFILE = realHome;
-    delete process.env.LIVE;
-    delete process.env.OPENCLAW_LIVE_TEST;
-    delete process.env.OPENCLAW_LIVE_GATEWAY;
-    delete process.env.OPENCLAW_LIVE_USE_REAL_HOME;
-    delete process.env.OPENCLAW_LIVE_TEST_QUIET;
+    setTestEnvValue("HOME", realHome);
+    setTestEnvValue("USERPROFILE", realHome);
+    deleteTestEnvValue("LIVE");
+    deleteTestEnvValue("OPENCLAW_LIVE_TEST");
+    deleteTestEnvValue("OPENCLAW_LIVE_GATEWAY");
+    deleteTestEnvValue("OPENCLAW_LIVE_USE_REAL_HOME");
+    deleteTestEnvValue("OPENCLAW_LIVE_TEST_QUIET");
 
     const testEnv = installTestEnv();
     cleanupFns.push(testEnv.cleanup);
@@ -255,11 +256,11 @@ describe("installTestEnv", () => {
     const realHome = createTempHome();
     writeFile(path.join(realHome, ".profile"), "export TEST_PROFILE_ONLY=from-profile\n");
 
-    process.env.HOME = realHome;
-    process.env.USERPROFILE = realHome;
-    process.env.OPENCLAW_LIVE_TEST = "1";
-    process.env.OPENCLAW_LIVE_USE_REAL_HOME = "1";
-    process.env.OPENCLAW_LIVE_TEST_QUIET = "1";
+    setTestEnvValue("HOME", realHome);
+    setTestEnvValue("USERPROFILE", realHome);
+    setTestEnvValue("OPENCLAW_LIVE_TEST", "1");
+    setTestEnvValue("OPENCLAW_LIVE_USE_REAL_HOME", "1");
+    setTestEnvValue("OPENCLAW_LIVE_TEST_QUIET", "1");
 
     vi.doMock("node:child_process", () => ({
       execFileSync: () => {