From cf371fde6dbb9f9795f220f744458b5f41809ccb Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Sat, 21 Feb 2026 18:40:59 +0000
Subject: [PATCH] refactor(test): use env helper in workspace skills prompt
 gating

---
 ...orkspace-skills-managed-skills.e2e.test.ts | 33 +++++++++----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/agents/skills.build-workspace-skills-prompt.prefers-workspace-skills-managed-skills.e2e.test.ts b/src/agents/skills.build-workspace-skills-prompt.prefers-workspace-skills-managed-skills.e2e.test.ts
index af9c651fc..5bd992148 100644
--- a/src/agents/skills.build-workspace-skills-prompt.prefers-workspace-skills-managed-skills.e2e.test.ts
+++ b/src/agents/skills.build-workspace-skills-prompt.prefers-workspace-skills-managed-skills.e2e.test.ts
@@ -2,6 +2,7 @@ import fs from "node:fs/promises";
 import os from "node:os";
 import path from "node:path";
 import { describe, expect, it } from "vitest";
+import { withEnv } from "../test-utils/env.js";
 import { writeSkill } from "./skills.e2e-test-helpers.js";
 import { buildWorkspaceSkillsPrompt } from "./skills.js";
 
@@ -47,7 +48,6 @@ describe("buildWorkspaceSkillsPrompt", () => {
     const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-"));
     const skillsDir = path.join(workspaceDir, "skills");
     const binDir = path.join(workspaceDir, "bin");
-    const originalPath = process.env.PATH;
 
     await writeSkill({
       dir: path.join(skillsDir, "bin-skill"),
@@ -80,22 +80,21 @@ describe("buildWorkspaceSkillsPrompt", () => {
       metadata: '{"openclaw":{"requires":{"env":["ENV_KEY"]},"primaryEnv":"ENV_KEY"}}',
     });
 
-    try {
-      const defaultPrompt = buildWorkspaceSkillsPrompt(workspaceDir, {
-        managedSkillsDir: path.join(workspaceDir, ".managed"),
-      });
-      expect(defaultPrompt).toContain("always-skill");
-      expect(defaultPrompt).toContain("config-skill");
-      expect(defaultPrompt).not.toContain("bin-skill");
-      expect(defaultPrompt).not.toContain("anybin-skill");
-      expect(defaultPrompt).not.toContain("env-skill");
+    const defaultPrompt = buildWorkspaceSkillsPrompt(workspaceDir, {
+      managedSkillsDir: path.join(workspaceDir, ".managed"),
+    });
+    expect(defaultPrompt).toContain("always-skill");
+    expect(defaultPrompt).toContain("config-skill");
+    expect(defaultPrompt).not.toContain("bin-skill");
+    expect(defaultPrompt).not.toContain("anybin-skill");
+    expect(defaultPrompt).not.toContain("env-skill");
 
-      await fs.mkdir(binDir, { recursive: true });
-      const fakebinPath = path.join(binDir, "fakebin");
-      await fs.writeFile(fakebinPath, "#!/bin/sh\nexit 0\n", "utf-8");
-      await fs.chmod(fakebinPath, 0o755);
-      process.env.PATH = `${binDir}${path.delimiter}${originalPath ?? ""}`;
+    await fs.mkdir(binDir, { recursive: true });
+    const fakebinPath = path.join(binDir, "fakebin");
+    await fs.writeFile(fakebinPath, "#!/bin/sh\nexit 0\n", "utf-8");
+    await fs.chmod(fakebinPath, 0o755);
 
+    withEnv({ PATH: `${binDir}${path.delimiter}${process.env.PATH ?? ""}` }, () => {
       const gatedPrompt = buildWorkspaceSkillsPrompt(workspaceDir, {
         managedSkillsDir: path.join(workspaceDir, ".managed"),
         config: {
@@ -108,9 +107,7 @@ describe("buildWorkspaceSkillsPrompt", () => {
       expect(gatedPrompt).toContain("env-skill");
       expect(gatedPrompt).toContain("always-skill");
       expect(gatedPrompt).not.toContain("config-skill");
-    } finally {
-      process.env.PATH = originalPath;
-    }
+    });
   });
   it("uses skillKey for config lookups", async () => {
     const workspaceDir = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-"));