From cd9060e06ac5a692b957bf3be36a858d2f758dfc Mon Sep 17 00:00:00 2001
From: Shakker <shakkerdroid@gmail.com>
Date: Sun, 21 Jun 2026 22:13:37 +0100
Subject: [PATCH] test: restore host cleanup state env

---
 .../host-hook-cleanup.session-store.test.ts   | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/plugins/host-hook-cleanup.session-store.test.ts b/src/plugins/host-hook-cleanup.session-store.test.ts
index 00aaa58f9244..3a329574c382 100644
--- a/src/plugins/host-hook-cleanup.session-store.test.ts
+++ b/src/plugins/host-hook-cleanup.session-store.test.ts
@@ -10,33 +10,28 @@ import {
 import type { SessionEntry } from "../config/sessions/types.js";
 import * as jsonFiles from "../infra/json-files.js";
 import { resolvePreferredOpenClawTmpDir } from "../infra/tmp-openclaw-dir.js";
+import { captureEnv, setTestEnvValue } from "../test-utils/env.js";
 import { runPluginHostCleanup } from "./host-hook-cleanup.js";
 import { createEmptyPluginRegistry } from "./registry-empty.js";
 
 describe("plugin host cleanup session stores", () => {
   let stateDir: string | undefined;
-  let previousStateDir: string | undefined;
+  const envSnapshot = captureEnv(["OPENCLAW_STATE_DIR"]);
 
   afterEach(async () => {
     clearSessionStoreCacheForTest();
-    if (previousStateDir === undefined) {
-      delete process.env.OPENCLAW_STATE_DIR;
-    } else {
-      process.env.OPENCLAW_STATE_DIR = previousStateDir;
-    }
+    envSnapshot.restore();
     if (stateDir) {
       await fs.rm(stateDir, { recursive: true, force: true });
     }
     stateDir = undefined;
-    previousStateDir = undefined;
   });
 
   it("does not rewrite session stores when cleanup scans find no plugin-owned state", async () => {
     stateDir = await fs.mkdtemp(
       path.join(resolvePreferredOpenClawTmpDir(), "openclaw-host-cleanup-noop-"),
     );
-    previousStateDir = process.env.OPENCLAW_STATE_DIR;
-    process.env.OPENCLAW_STATE_DIR = stateDir;
+    setTestEnvValue("OPENCLAW_STATE_DIR", stateDir);
     const storePath = path.join(stateDir, "sessions.json");
     await saveSessionStore(
       storePath,
@@ -65,8 +60,7 @@ describe("plugin host cleanup session stores", () => {
     stateDir = await fs.mkdtemp(
       path.join(resolvePreferredOpenClawTmpDir(), "openclaw-host-cleanup-deferred-"),
     );
-    previousStateDir = process.env.OPENCLAW_STATE_DIR;
-    process.env.OPENCLAW_STATE_DIR = stateDir;
+    setTestEnvValue("OPENCLAW_STATE_DIR", stateDir);
     const storePath = path.join(stateDir, "sessions.json");
     await saveSessionStore(
       storePath,
@@ -106,8 +100,7 @@ describe("plugin host cleanup session stores", () => {
     stateDir = await fs.mkdtemp(
       path.join(resolvePreferredOpenClawTmpDir(), "openclaw-host-cleanup-multistore-"),
     );
-    previousStateDir = process.env.OPENCLAW_STATE_DIR;
-    process.env.OPENCLAW_STATE_DIR = stateDir;
+    setTestEnvValue("OPENCLAW_STATE_DIR", stateDir);
     const firstStorePath = path.join(stateDir, "agent-a", "sessions.json");
     const secondStorePath = path.join(stateDir, "agent-b", "sessions.json");
     const beforeUpdatedAt = 100;