refactor(test): consolidate temp home + vitest setup

.github/workflows/workflow-sanity.yml

@@ -0,0 +1,37 @@
+name: Workflow Sanity
+
+on:
+  pull_request:
+  push:
+
+jobs:
+  no-tabs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Fail on tabs in workflow files
+        run: |
+          python - <<'PY'
+          from __future__ import annotations
+
+          import pathlib
+          import sys
+
+          root = pathlib.Path(".github/workflows")
+          bad: list[str] = []
+          for path in sorted(root.rglob("*.yml")):
+            if b"\t" in path.read_bytes():
+              bad.append(str(path))
+
+          for path in sorted(root.rglob("*.yaml")):
+            if b"\t" in path.read_bytes():
+              bad.append(str(path))
+
+          if bad:
+            print("Tabs found in workflow file(s):")
+            for path in bad:
+              print(f"- {path}")
+            sys.exit(1)
+          PY

src/agents/auth-profiles.test.ts

@@ -4,6 +4,7 @@ import path from "node:path";
 
 import { describe, expect, it } from "vitest";
 
+import { withTempHome } from "../../test/helpers/temp-home.js";
 import {
   type AuthProfileStore,
   CLAUDE_CLI_PROFILE_ID,
@@ -13,40 +14,6 @@ import {
   resolveAuthProfileOrder,
 } from "./auth-profiles.js";
 
-const HOME_ENV_KEYS = ["HOME", "USERPROFILE", "HOMEDRIVE", "HOMEPATH"] as const;
-type HomeEnvSnapshot = Record<
-  (typeof HOME_ENV_KEYS)[number],
-  string | undefined
->;
-
-const snapshotHomeEnv = (): HomeEnvSnapshot => ({
-  HOME: process.env.HOME,
-  USERPROFILE: process.env.USERPROFILE,
-  HOMEDRIVE: process.env.HOMEDRIVE,
-  HOMEPATH: process.env.HOMEPATH,
-});
-
-const restoreHomeEnv = (snapshot: HomeEnvSnapshot) => {
-  for (const key of HOME_ENV_KEYS) {
-    const value = snapshot[key];
-    if (value === undefined) {
-      delete process.env[key];
-    } else {
-      process.env[key] = value;
-    }
-  }
-};
-
-const setTempHome = (tempHome: string) => {
-  process.env.HOME = tempHome;
-  if (process.platform === "win32") {
-    process.env.USERPROFILE = tempHome;
-    const root = path.parse(tempHome).root;
-    process.env.HOMEDRIVE = root.replace(/\\$/, "");
-    process.env.HOMEPATH = tempHome.slice(root.length - 1);
-  }
-};
-
 describe("resolveAuthProfileOrder", () => {
   const store: AuthProfileStore = {
     version: 1,
@@ -431,17 +398,14 @@ describe("auth profile cooldowns", () => {
 });
 
 describe("external CLI credential sync", () => {
-  it("syncs Claude CLI credentials into anthropic:claude-cli", () => {
+  it("syncs Claude CLI credentials into anthropic:claude-cli", async () => {
     const agentDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "clawdbot-cli-sync-"),
     );
-    const originalHome = snapshotHomeEnv();
-
     try {
       // Create a temp home with Claude CLI credentials
-      const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-home-"));
+      await withTempHome(
-      setTempHome(tempHome);
+        async (tempHome) => {
-
           // Create Claude CLI credentials
           const claudeDir = path.join(tempHome, ".claude");
           fs.mkdirSync(claudeDir, { recursive: true });
@@ -477,32 +441,32 @@ describe("external CLI credential sync", () => {
           const store = ensureAuthProfileStore(agentDir);
 
           expect(store.profiles["anthropic:default"]).toBeDefined();
-      expect((store.profiles["anthropic:default"] as { key: string }).key).toBe(
+          expect(
-        "sk-default",
+            (store.profiles["anthropic:default"] as { key: string }).key,
-      );
+          ).toBe("sk-default");
           expect(store.profiles[CLAUDE_CLI_PROFILE_ID]).toBeDefined();
           expect(
             (store.profiles[CLAUDE_CLI_PROFILE_ID] as { token: string }).token,
           ).toBe("fresh-access-token");
           expect(
-        (store.profiles[CLAUDE_CLI_PROFILE_ID] as { expires: number }).expires,
+            (store.profiles[CLAUDE_CLI_PROFILE_ID] as { expires: number })
+              .expires,
           ).toBeGreaterThan(Date.now());
+        },
+        { prefix: "clawdbot-home-" },
+      );
     } finally {
-      restoreHomeEnv(originalHome);
       fs.rmSync(agentDir, { recursive: true, force: true });
     }
   });
 
-  it("syncs Codex CLI credentials into openai-codex:codex-cli", () => {
+  it("syncs Codex CLI credentials into openai-codex:codex-cli", async () => {
     const agentDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "clawdbot-codex-sync-"),
     );
-    const originalHome = snapshotHomeEnv();
-
     try {
-      const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-home-"));
+      await withTempHome(
-      setTempHome(tempHome);
+        async (tempHome) => {
-
           // Create Codex CLI credentials
           const codexDir = path.join(tempHome, ".codex");
           fs.mkdirSync(codexDir, { recursive: true });
@@ -531,22 +495,21 @@ describe("external CLI credential sync", () => {
           expect(
             (store.profiles[CODEX_CLI_PROFILE_ID] as { access: string }).access,
           ).toBe("codex-access-token");
+        },
+        { prefix: "clawdbot-home-" },
+      );
     } finally {
-      restoreHomeEnv(originalHome);
       fs.rmSync(agentDir, { recursive: true, force: true });
     }
   });
 
-  it("does not overwrite API keys when syncing external CLI creds", () => {
+  it("does not overwrite API keys when syncing external CLI creds", async () => {
     const agentDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "clawdbot-no-overwrite-"),
     );
-    const originalHome = snapshotHomeEnv();
-
     try {
-      const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-home-"));
+      await withTempHome(
-      setTempHome(tempHome);
+        async (tempHome) => {
-
           // Create Claude CLI credentials
           const claudeDir = path.join(tempHome, ".claude");
           fs.mkdirSync(claudeDir, { recursive: true });
@@ -581,26 +544,25 @@ describe("external CLI credential sync", () => {
           const store = ensureAuthProfileStore(agentDir);
 
           // Should keep the store's API key and still add the CLI profile.
-      expect((store.profiles["anthropic:default"] as { key: string }).key).toBe(
+          expect(
-        "sk-store",
+            (store.profiles["anthropic:default"] as { key: string }).key,
-      );
+          ).toBe("sk-store");
           expect(store.profiles[CLAUDE_CLI_PROFILE_ID]).toBeDefined();
+        },
+        { prefix: "clawdbot-home-" },
+      );
     } finally {
-      restoreHomeEnv(originalHome);
       fs.rmSync(agentDir, { recursive: true, force: true });
     }
   });
 
-  it("does not overwrite fresher store token with older Claude CLI credentials", () => {
+  it("does not overwrite fresher store token with older Claude CLI credentials", async () => {
     const agentDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "clawdbot-cli-no-downgrade-"),
     );
-    const originalHome = snapshotHomeEnv();
-
     try {
-      const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-home-"));
+      await withTempHome(
-      setTempHome(tempHome);
+        async (tempHome) => {
-
           const claudeDir = path.join(tempHome, ".claude");
           fs.mkdirSync(claudeDir, { recursive: true });
           fs.writeFileSync(
@@ -634,29 +596,31 @@ describe("external CLI credential sync", () => {
           expect(
             (store.profiles[CLAUDE_CLI_PROFILE_ID] as { token: string }).token,
           ).toBe("store-access");
+        },
+        { prefix: "clawdbot-home-" },
+      );
     } finally {
-      restoreHomeEnv(originalHome);
       fs.rmSync(agentDir, { recursive: true, force: true });
     }
   });
 
-  it("updates codex-cli profile when Codex CLI refresh token changes", () => {
+  it("updates codex-cli profile when Codex CLI refresh token changes", async () => {
     const agentDir = fs.mkdtempSync(
       path.join(os.tmpdir(), "clawdbot-codex-refresh-sync-"),
     );
-    const originalHome = snapshotHomeEnv();
-
     try {
-      const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-home-"));
+      await withTempHome(
-      setTempHome(tempHome);
+        async (tempHome) => {
-
           const codexDir = path.join(tempHome, ".codex");
           fs.mkdirSync(codexDir, { recursive: true });
           const codexAuthPath = path.join(codexDir, "auth.json");
           fs.writeFileSync(
             codexAuthPath,
             JSON.stringify({
-          tokens: { access_token: "same-access", refresh_token: "new-refresh" },
+              tokens: {
+                access_token: "same-access",
+                refresh_token: "new-refresh",
+              },
             }),
           );
           fs.utimesSync(codexAuthPath, new Date(), new Date());
@@ -680,10 +644,13 @@ describe("external CLI credential sync", () => {
 
           const store = ensureAuthProfileStore(agentDir);
           expect(
-        (store.profiles[CODEX_CLI_PROFILE_ID] as { refresh: string }).refresh,
+            (store.profiles[CODEX_CLI_PROFILE_ID] as { refresh: string })
+              .refresh,
           ).toBe("new-refresh");
+        },
+        { prefix: "clawdbot-home-" },
+      );
     } finally {
-      restoreHomeEnv(originalHome);
       fs.rmSync(agentDir, { recursive: true, force: true });
     }
   });

src/agents/models-config.test.ts

@@ -1,20 +1,12 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-models-"));
+  return withTempHomeBase(fn, { prefix: "clawdbot-models-" });
-  const previousHome = process.env.HOME;
-  process.env.HOME = base;
-  try {
-    return await fn(base);
-  } finally {
-    process.env.HOME = previousHome;
-    await fs.rm(base, { recursive: true, force: true });
-  }
 }
 
 const MODELS_CONFIG: ClawdbotConfig = {

src/auto-reply/reply.block-streaming.test.ts

@@ -1,9 +1,8 @@
-import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import { loadModelCatalog } from "../agents/model-catalog.js";
 import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import { getReplyFromConfig } from "./reply.js";
@@ -22,15 +21,7 @@ vi.mock("../agents/model-catalog.js", () => ({
 }));
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-stream-"));
+  return withTempHomeBase(fn, { prefix: "clawdbot-stream-" });
-  const previousHome = process.env.HOME;
-  process.env.HOME = base;
-  try {
-    return await fn(base);
-  } finally {
-    process.env.HOME = previousHome;
-    await fs.rm(base, { recursive: true, force: true });
-  }
 }
 
 describe("block streaming", () => {

src/auto-reply/reply.directive.test.ts

@@ -1,9 +1,9 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import { loadModelCatalog } from "../agents/model-catalog.js";
 import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import {
@@ -28,28 +28,30 @@ vi.mock("../agents/model-catalog.js", () => ({
 }));
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-reply-"));
+  return withTempHomeBase(
-  const previousHome = process.env.HOME;
+    async (home) => {
       const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
       const previousAgentDir = process.env.CLAWDBOT_AGENT_DIR;
       const previousPiAgentDir = process.env.PI_CODING_AGENT_DIR;
-  process.env.HOME = base;
+      process.env.CLAWDBOT_STATE_DIR = path.join(home, ".clawdbot");
-  process.env.CLAWDBOT_STATE_DIR = path.join(base, ".clawdbot");
+      process.env.CLAWDBOT_AGENT_DIR = path.join(home, ".clawdbot", "agent");
-  process.env.CLAWDBOT_AGENT_DIR = path.join(base, ".clawdbot", "agent");
       process.env.PI_CODING_AGENT_DIR = process.env.CLAWDBOT_AGENT_DIR;
       try {
-    return await fn(base);
+        return await fn(home);
       } finally {
-    process.env.HOME = previousHome;
+        if (previousStateDir === undefined)
-    if (previousStateDir === undefined) delete process.env.CLAWDBOT_STATE_DIR;
+          delete process.env.CLAWDBOT_STATE_DIR;
         else process.env.CLAWDBOT_STATE_DIR = previousStateDir;
-    if (previousAgentDir === undefined) delete process.env.CLAWDBOT_AGENT_DIR;
+        if (previousAgentDir === undefined)
+          delete process.env.CLAWDBOT_AGENT_DIR;
         else process.env.CLAWDBOT_AGENT_DIR = previousAgentDir;
         if (previousPiAgentDir === undefined)
           delete process.env.PI_CODING_AGENT_DIR;
         else process.env.PI_CODING_AGENT_DIR = previousPiAgentDir;
-    await fs.rm(base, { recursive: true, force: true });
       }
+    },
+    { prefix: "clawdbot-reply-" },
+  );
 }
 
 describe("directive behavior", () => {

src/auto-reply/reply.heartbeat-typing.test.ts

@@ -1,9 +1,9 @@
-import fs from "node:fs/promises";
-import { tmpdir } from "node:os";
 import { join } from "node:path";
 
 import { afterEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
+
 const runEmbeddedPiAgentMock = vi.fn();
 
 vi.mock("../agents/model-fallback.js", () => ({
@@ -43,16 +43,13 @@ vi.mock("../web/session.js", () => webMocks);
 import { getReplyFromConfig } from "./reply.js";
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(join(tmpdir(), "clawdbot-typing-"));
+  return withTempHomeBase(
-  const previousHome = process.env.HOME;
+    async (home) => {
-  process.env.HOME = base;
-  try {
       runEmbeddedPiAgentMock.mockClear();
-    return await fn(base);
+      return await fn(home);
-  } finally {
+    },
-    process.env.HOME = previousHome;
+    { prefix: "clawdbot-typing-" },
-    await fs.rm(base, { recursive: true, force: true });
+  );
-  }
 }
 
 function makeCfg(home: string) {

src/auto-reply/reply.media-note.test.ts

@@ -1,9 +1,8 @@
-import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import { getReplyFromConfig } from "./reply.js";
 
@@ -28,27 +27,26 @@ function makeResult(text: string) {
 }
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-media-note-"));
+  return withTempHomeBase(
-  const previousHome = process.env.HOME;
+    async (home) => {
       const previousBundledSkills = process.env.CLAWDBOT_BUNDLED_SKILLS_DIR;
-  process.env.HOME = base;
+      process.env.CLAWDBOT_BUNDLED_SKILLS_DIR = path.join(
-  process.env.CLAWDBOT_BUNDLED_SKILLS_DIR = path.join(base, "bundled-skills");
+        home,
+        "bundled-skills",
+      );
       try {
         vi.mocked(runEmbeddedPiAgent).mockReset();
-    return await fn(base);
+        return await fn(home);
       } finally {
-    process.env.HOME = previousHome;
         if (previousBundledSkills === undefined) {
           delete process.env.CLAWDBOT_BUNDLED_SKILLS_DIR;
         } else {
           process.env.CLAWDBOT_BUNDLED_SKILLS_DIR = previousBundledSkills;
         }
-    try {
-      await fs.rm(base, { recursive: true, force: true });
-    } catch {
-      // ignore cleanup failures in tests
-    }
       }
+    },
+    { prefix: "clawdbot-media-note-" },
+  );
 }
 
 function makeCfg(home: string) {

src/auto-reply/reply.queue.test.ts

@@ -1,9 +1,8 @@
-import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { afterEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import {
   isEmbeddedPiRunActive,
   isEmbeddedPiRunStreaming,
@@ -32,20 +31,13 @@ function makeResult(text: string) {
 }
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-queue-"));
+  return withTempHomeBase(
-  const previousHome = process.env.HOME;
+    async (home) => {
-  process.env.HOME = base;
-  try {
       vi.mocked(runEmbeddedPiAgent).mockReset();
-    return await fn(base);
+      return await fn(home);
-  } finally {
+    },
-    process.env.HOME = previousHome;
+    { prefix: "clawdbot-queue-" },
-    try {
+  );
-      await fs.rm(base, { recursive: true, force: true });
-    } catch {
-      // ignore cleanup failures in tests
-    }
-  }
 }
 
 function makeCfg(home: string, queue?: Record<string, unknown>) {

src/auto-reply/reply.triggers.test.ts

@@ -3,6 +3,8 @@ import { tmpdir } from "node:os";
 import { basename, join } from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
+
 vi.mock("../agents/pi-embedded.js", () => ({
   abortEmbeddedPiRun: vi.fn().mockReturnValue(false),
   compactEmbeddedPiSession: vi.fn(),
@@ -51,37 +53,26 @@ const webMocks = vi.hoisted(() => ({
 vi.mock("../web/session.js", () => webMocks);
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(join(tmpdir(), "clawdbot-triggers-"));
+  return withTempHomeBase(
-  const previousHome = process.env.HOME;
+    async (home) => {
-  const previousUserProfile = process.env.USERPROFILE;
-  const previousHomeDrive = process.env.HOMEDRIVE;
-  const previousHomePath = process.env.HOMEPATH;
       const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
       const previousClawdisStateDir = process.env.CLAWDIS_STATE_DIR;
-  process.env.HOME = base;
+      process.env.CLAWDBOT_STATE_DIR = join(home, ".clawdbot");
-  process.env.CLAWDBOT_STATE_DIR = join(base, ".clawdbot");
+      process.env.CLAWDIS_STATE_DIR = join(home, ".clawdbot");
-  process.env.CLAWDIS_STATE_DIR = join(base, ".clawdbot");
-  if (process.platform === "win32") {
-    process.env.USERPROFILE = base;
-    const driveMatch = base.match(/^([A-Za-z]:)(.*)$/);
-    if (driveMatch) {
-      process.env.HOMEDRIVE = driveMatch[1];
-      process.env.HOMEPATH = driveMatch[2] || "\\";
-    }
-  }
       try {
         vi.mocked(runEmbeddedPiAgent).mockClear();
         vi.mocked(abortEmbeddedPiRun).mockClear();
-    return await fn(base);
+        return await fn(home);
       } finally {
-    process.env.HOME = previousHome;
+        if (previousStateDir === undefined) delete process.env.CLAWDBOT_STATE_DIR;
-    process.env.USERPROFILE = previousUserProfile;
+        else process.env.CLAWDBOT_STATE_DIR = previousStateDir;
-    process.env.HOMEDRIVE = previousHomeDrive;
+        if (previousClawdisStateDir === undefined)
-    process.env.HOMEPATH = previousHomePath;
+          delete process.env.CLAWDIS_STATE_DIR;
-    process.env.CLAWDBOT_STATE_DIR = previousStateDir;
+        else process.env.CLAWDIS_STATE_DIR = previousClawdisStateDir;
-    process.env.CLAWDIS_STATE_DIR = previousClawdisStateDir;
-    await fs.rm(base, { recursive: true, force: true });
       }
+    },
+    { prefix: "clawdbot-triggers-" },
+  );
 }
 
 function makeCfg(home: string) {
@@ -320,7 +311,7 @@ describe("trigger handling", () => {
       );
       const text = Array.isArray(res) ? res[0]?.text : res?.text;
       expect(text).toContain("api-key");
-      expect(text).toContain("…");
+      expect(text).toMatch(/…|\.{3}/);
       expect(text).toContain("(anthropic:work)");
       expect(text).not.toContain("mixed");
       expect(runEmbeddedPiAgent).not.toHaveBeenCalled();

src/auto-reply/status.test.ts

@@ -1,44 +1,10 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { afterEach, describe, expect, it, vi } from "vitest";
+import { withTempHome } from "../../test/helpers/temp-home.js";
 import type { ClawdbotConfig } from "../config/config.js";
 import { buildStatusMessage } from "./status.js";
 
-const HOME_ENV_KEYS = ["HOME", "USERPROFILE", "HOMEDRIVE", "HOMEPATH"] as const;
-type HomeEnvSnapshot = Record<
-  (typeof HOME_ENV_KEYS)[number],
-  string | undefined
->;
-
-const snapshotHomeEnv = (): HomeEnvSnapshot => ({
-  HOME: process.env.HOME,
-  USERPROFILE: process.env.USERPROFILE,
-  HOMEDRIVE: process.env.HOMEDRIVE,
-  HOMEPATH: process.env.HOMEPATH,
-});
-
-const restoreHomeEnv = (snapshot: HomeEnvSnapshot) => {
-  for (const key of HOME_ENV_KEYS) {
-    const value = snapshot[key];
-    if (value === undefined) {
-      delete process.env[key];
-    } else {
-      process.env[key] = value;
-    }
-  }
-};
-
-const setTempHome = (tempHome: string) => {
-  process.env.HOME = tempHome;
-  if (process.platform === "win32") {
-    process.env.USERPROFILE = tempHome;
-    const root = path.parse(tempHome).root;
-    process.env.HOMEDRIVE = root.replace(/\\$/, "");
-    process.env.HOMEPATH = tempHome.slice(root.length - 1);
-  }
-};
-
 afterEach(() => {
   vi.restoreAllMocks();
 });
@@ -260,10 +226,8 @@ describe("buildStatusMessage", () => {
   });
 
   it("prefers cached prompt tokens from the session log", async () => {
-    const dir = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-status-"));
+    await withTempHome(
-    const previousHome = snapshotHomeEnv();
+      async (dir) => {
-    setTempHome(dir);
-    try {
         vi.resetModules();
         const { buildStatusMessage: buildStatusMessageDynamic } = await import(
           "./status.js"
@@ -320,9 +284,8 @@ describe("buildStatusMessage", () => {
         });
 
         expect(text).toContain("Context: 1.0k/32k");
-    } finally {
+      },
-      restoreHomeEnv(previousHome);
+      { prefix: "clawdbot-status-" },
-      fs.rmSync(dir, { recursive: true, force: true });
+    );
-    }
   });
 });

src/commands/agent.test.ts

@@ -1,5 +1,4 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 
 import {
@@ -11,6 +10,8 @@ import {
   vi,
 } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
+
 vi.mock("../agents/pi-embedded.js", () => ({
   abortEmbeddedPiRun: vi.fn().mockReturnValue(false),
   runEmbeddedPiAgent: vi.fn(),
@@ -39,15 +40,7 @@ const runtime: RuntimeEnv = {
 const configSpy = vi.spyOn(configModule, "loadConfig");
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = fs.mkdtempSync(path.join(os.tmpdir(), "clawdbot-agent-"));
+  return withTempHomeBase(fn, { prefix: "clawdbot-agent-" });
-  const previousHome = process.env.HOME;
-  process.env.HOME = base;
-  try {
-    return await fn(base);
-  } finally {
-    process.env.HOME = previousHome;
-    fs.rmSync(base, { recursive: true, force: true });
-  }
 }
 
 function mockConfig(

src/config/config.test.ts

@@ -1,41 +1,13 @@
 import fs from "node:fs/promises";
-import os from "node:os";
+import { tmpdir } from "node:os";
 import path from "node:path";
 
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
+
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-config-"));
+  return withTempHomeBase(fn, { prefix: "clawdbot-config-" });
-  const previousHome = process.env.HOME;
-  const previousUserProfile = process.env.USERPROFILE;
-  const previousHomeDrive = process.env.HOMEDRIVE;
-  const previousHomePath = process.env.HOMEPATH;
-  process.env.HOME = base;
-  process.env.USERPROFILE = base;
-  if (process.platform === "win32") {
-    const parsed = path.parse(base);
-    process.env.HOMEDRIVE = parsed.root.replace(/\\$/, "");
-    process.env.HOMEPATH = base.slice(Math.max(parsed.root.length - 1, 0));
-  }
-  try {
-    return await fn(base);
-  } finally {
-    process.env.HOME = previousHome;
-    process.env.USERPROFILE = previousUserProfile;
-    if (process.platform === "win32") {
-      if (previousHomeDrive === undefined) {
-        delete process.env.HOMEDRIVE;
-      } else {
-        process.env.HOMEDRIVE = previousHomeDrive;
-      }
-      if (previousHomePath === undefined) {
-        delete process.env.HOMEPATH;
-      } else {
-        process.env.HOMEPATH = previousHomePath;
-      }
-    }
-    await fs.rm(base, { recursive: true, force: true });
-  }
 }
 
 /**
@@ -1277,7 +1249,7 @@ describe("multi-agent agentDir validation", () => {
   it("rejects shared agents.list agentDir", async () => {
     vi.resetModules();
     const { validateConfigObject } = await import("./config.js");
-    const shared = path.join(os.tmpdir(), "clawdbot-shared-agentdir");
+    const shared = path.join(tmpdir(), "clawdbot-shared-agentdir");
     const res = validateConfigObject({
       agents: {
         list: [

src/cron/isolated-agent.test.ts

@@ -1,9 +1,9 @@
 import fs from "node:fs/promises";
-import os from "node:os";
 import path from "node:path";
 
 import { beforeEach, describe, expect, it, vi } from "vitest";
 
+import { withTempHome as withTempHomeBase } from "../../test/helpers/temp-home.js";
 import type { CliDeps } from "../cli/deps.js";
 import type { ClawdbotConfig } from "../config/config.js";
 import type { CronJob } from "./types.js";
@@ -23,15 +23,7 @@ import { runEmbeddedPiAgent } from "../agents/pi-embedded.js";
 import { runCronIsolatedAgentTurn } from "./isolated-agent.js";
 
 async function withTempHome<T>(fn: (home: string) => Promise<T>): Promise<T> {
-  const base = await fs.mkdtemp(path.join(os.tmpdir(), "clawdbot-cron-"));
+  return withTempHomeBase(fn, { prefix: "clawdbot-cron-" });
-  const previousHome = process.env.HOME;
-  process.env.HOME = base;
-  try {
-    return await fn(base);
-  } finally {
-    process.env.HOME = previousHome;
-    await fs.rm(base, { recursive: true, force: true });
-  }
 }
 
 async function writeSessionStore(home: string) {

src/infra/provider-usage.test.ts

@@ -1,7 +1,7 @@
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
 import { describe, expect, it, vi } from "vitest";
+import { withTempHome } from "../../test/helpers/temp-home.js";
 import {
   ensureAuthProfileStore,
   listProfilesForProvider,
@@ -73,45 +73,6 @@ describe("provider usage formatting", () => {
 });
 
 describe("provider usage loading", () => {
-  const HOME_ENV_KEYS = [
-    "HOME",
-    "USERPROFILE",
-    "HOMEDRIVE",
-    "HOMEPATH",
-  ] as const;
-  type HomeEnvSnapshot = Record<
-    (typeof HOME_ENV_KEYS)[number],
-    string | undefined
-  >;
-
-  const snapshotHomeEnv = (): HomeEnvSnapshot => ({
-    HOME: process.env.HOME,
-    USERPROFILE: process.env.USERPROFILE,
-    HOMEDRIVE: process.env.HOMEDRIVE,
-    HOMEPATH: process.env.HOMEPATH,
-  });
-
-  const restoreHomeEnv = (snapshot: HomeEnvSnapshot) => {
-    for (const key of HOME_ENV_KEYS) {
-      const value = snapshot[key];
-      if (value === undefined) {
-        delete process.env[key];
-      } else {
-        process.env[key] = value;
-      }
-    }
-  };
-
-  const setTempHome = (tempHome: string) => {
-    process.env.HOME = tempHome;
-    if (process.platform === "win32") {
-      process.env.USERPROFILE = tempHome;
-      const root = path.parse(tempHome).root;
-      process.env.HOMEDRIVE = root.replace(/\\$/, "");
-      process.env.HOMEPATH = tempHome.slice(root.length - 1);
-    }
-  };
-
   it("loads usage snapshots with injected auth", async () => {
     const makeResponse = (status: number, body: unknown): Response => {
       const payload = typeof body === "string" ? body : JSON.stringify(body);
@@ -175,13 +136,9 @@ describe("provider usage loading", () => {
   });
 
   it("discovers Claude usage from token auth profiles", async () => {
-    const homeSnapshot = snapshotHomeEnv();
+    await withTempHome(
-    const stateSnapshot = process.env.CLAWDBOT_STATE_DIR;
+      async (tempHome) => {
-    const tempHome = fs.mkdtempSync(
+        const previousStateDir = process.env.CLAWDBOT_STATE_DIR;
-      path.join(os.tmpdir(), "clawdbot-provider-usage-"),
-    );
-    try {
-      setTempHome(tempHome);
         process.env.CLAWDBOT_STATE_DIR = path.join(tempHome, ".clawdbot");
         const agentDir = path.join(
           process.env.CLAWDBOT_STATE_DIR,
@@ -189,6 +146,7 @@ describe("provider usage loading", () => {
           "main",
           "agent",
         );
+        try {
           fs.mkdirSync(agentDir, { recursive: true, mode: 0o700 });
           fs.writeFileSync(
             path.join(agentDir, "auth-profiles.json"),
@@ -218,7 +176,8 @@ describe("provider usage loading", () => {
           );
 
           const makeResponse = (status: number, body: unknown): Response => {
-        const payload = typeof body === "string" ? body : JSON.stringify(body);
+            const payload =
+              typeof body === "string" ? body : JSON.stringify(body);
             const headers =
               typeof body === "string"
                 ? undefined
@@ -240,7 +199,10 @@ describe("provider usage loading", () => {
               const headers = (init?.headers ?? {}) as Record<string, string>;
               expect(headers.Authorization).toBe("Bearer token-1");
               return makeResponse(200, {
-            five_hour: { utilization: 20, resets_at: "2026-01-07T01:00:00Z" },
+                five_hour: {
+                  utilization: 20,
+                  resets_at: "2026-01-07T01:00:00Z",
+                },
               });
             }
             return makeResponse(404, "not found");
@@ -259,10 +221,13 @@ describe("provider usage loading", () => {
           expect(claude?.windows[0]?.label).toBe("5h");
           expect(mockFetch).toHaveBeenCalled();
         } finally {
-      restoreHomeEnv(homeSnapshot);
+          if (previousStateDir === undefined)
-      if (stateSnapshot === undefined) delete process.env.CLAWDBOT_STATE_DIR;
+            delete process.env.CLAWDBOT_STATE_DIR;
-      else process.env.CLAWDBOT_STATE_DIR = stateSnapshot;
+          else process.env.CLAWDBOT_STATE_DIR = previousStateDir;
         }
+      },
+      { prefix: "clawdbot-provider-usage-" },
+    );
   });
 
   it("falls back to claude.ai web usage when OAuth scope is missing", async () => {

test/helpers/temp-home.ts

@@ -0,0 +1,68 @@
+import fs from "node:fs/promises";
+import os from "node:os";
+import path from "node:path";
+
+type EnvSnapshot = {
+  home: string | undefined;
+  userProfile: string | undefined;
+  homeDrive: string | undefined;
+  homePath: string | undefined;
+};
+
+function snapshotEnv(): EnvSnapshot {
+  return {
+    home: process.env.HOME,
+    userProfile: process.env.USERPROFILE,
+    homeDrive: process.env.HOMEDRIVE,
+    homePath: process.env.HOMEPATH,
+  };
+}
+
+function restoreEnv(snapshot: EnvSnapshot) {
+  const restoreKey = (key: string, value: string | undefined) => {
+    if (value === undefined) delete process.env[key];
+    else process.env[key] = value;
+  };
+  restoreKey("HOME", snapshot.home);
+  restoreKey("USERPROFILE", snapshot.userProfile);
+  restoreKey("HOMEDRIVE", snapshot.homeDrive);
+  restoreKey("HOMEPATH", snapshot.homePath);
+}
+
+function setTempHome(base: string) {
+  process.env.HOME = base;
+  process.env.USERPROFILE = base;
+
+  if (process.platform !== "win32") return;
+  const match = base.match(/^([A-Za-z]:)(.*)$/);
+  if (!match) return;
+  process.env.HOMEDRIVE = match[1];
+  process.env.HOMEPATH = match[2] || "\\";
+}
+
+export async function withTempHome<T>(
+  fn: (home: string) => Promise<T>,
+  opts: { prefix?: string } = {},
+): Promise<T> {
+  const base = await fs.mkdtemp(
+    path.join(os.tmpdir(), opts.prefix ?? "clawdbot-test-home-"),
+  );
+  const snapshot = snapshotEnv();
+  setTempHome(base);
+
+  try {
+    return await fn(base);
+  } finally {
+    restoreEnv(snapshot);
+    try {
+      await fs.rm(base, {
+        recursive: true,
+        force: true,
+        maxRetries: 10,
+        retryDelay: 50,
+      });
+    } catch {
+      // ignore cleanup failures in tests
+    }
+  }
+}