fix: route skills home env restores

shakkernerd · shakkernerd · commit c946df023917 · 2026-06-20T04:13:52.000+01:00
diff --git a/src/skills/test-support/home-env.test-support.ts b/src/skills/test-support/home-env.test-support.ts
@@ -1,6 +1,7 @@
 // Home environment test support isolates HOME-style paths for skill tests.
 import os from "node:os";
 import { vi } from "vitest";
+import { deleteTestEnvValue, setTestEnvValue } from "../../test-utils/env.js";
 
 /** Process home env snapshot used by skill loader tests. */
 export type SkillsHomeEnvSnapshot = {
@@ -15,32 +16,28 @@ export function setMockSkillsHomeEnv(fakeHome: string): SkillsHomeEnvSnapshot {
     previousOpenClawHome: process.env.OPENCLAW_HOME,
     previousUserProfile: process.env.USERPROFILE,
   };
-  process.env.HOME = fakeHome;
-  delete process.env.OPENCLAW_HOME;
-  delete process.env.USERPROFILE;
+  setTestEnvValue("HOME", fakeHome);
+  deleteTestEnvValue("OPENCLAW_HOME");
+  deleteTestEnvValue("USERPROFILE");
   vi.spyOn(os, "homedir").mockReturnValue(fakeHome);
   return snapshot;
 }
 
+function restoreEnvValue(key: string, value: string | undefined): void {
+  if (value === undefined) {
+    deleteTestEnvValue(key);
+  } else {
+    setTestEnvValue(key, value);
+  }
+}
+
 export async function restoreMockSkillsHomeEnv(
   snapshot: SkillsHomeEnvSnapshot,
   cleanup?: () => Promise<void> | void,
 ) {
   vi.restoreAllMocks();
-  if (snapshot.previousHome === undefined) {
-    delete process.env.HOME;
-  } else {
-    process.env.HOME = snapshot.previousHome;
-  }
-  if (snapshot.previousOpenClawHome === undefined) {
-    delete process.env.OPENCLAW_HOME;
-  } else {
-    process.env.OPENCLAW_HOME = snapshot.previousOpenClawHome;
-  }
-  if (snapshot.previousUserProfile === undefined) {
-    delete process.env.USERPROFILE;
-  } else {
-    process.env.USERPROFILE = snapshot.previousUserProfile;
-  }
+  restoreEnvValue("HOME", snapshot.previousHome);
+  restoreEnvValue("OPENCLAW_HOME", snapshot.previousOpenClawHome);
+  restoreEnvValue("USERPROFILE", snapshot.previousUserProfile);
   await cleanup?.();
 }
