diff --git a/src/cli/browser-cli-extension.test.ts b/src/cli/browser-cli-extension.test.ts
index de279dd237..89f905d469 100644
--- a/src/cli/browser-cli-extension.test.ts
+++ b/src/cli/browser-cli-extension.test.ts
@@ -91,7 +91,6 @@ describe("browser extension install", () => {
       const dir = path.join(tmp, "browser", "chrome-extension");
       writeManifest(dir);
 
-      vi.resetModules();
       const { Command } = await import("commander");
       const { registerBrowserExtensionCommands } = await import("./browser-cli-extension.js");
 
diff --git a/src/cli/browser-cli-extension.ts b/src/cli/browser-cli-extension.ts
index 1ca53d985c..5650bd613e 100644
--- a/src/cli/browser-cli-extension.ts
+++ b/src/cli/browser-cli-extension.ts
@@ -3,7 +3,7 @@ import fs from "node:fs";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { movePathToTrash } from "../browser/trash.js";
-import { STATE_DIR } from "../config/paths.js";
+import { resolveStateDir } from "../config/paths.js";
 import { danger, info } from "../globals.js";
 import { copyToClipboard } from "../infra/clipboard.js";
 import { defaultRuntime } from "../runtime.js";
@@ -32,7 +32,7 @@ export function resolveBundledExtensionRootDir(
 }
 
 function installedExtensionRootDir() {
-  return path.join(STATE_DIR, "browser", "chrome-extension");
+  return path.join(resolveStateDir(), "browser", "chrome-extension");
 }
 
 function hasManifest(dir: string) {
@@ -48,7 +48,7 @@ export async function installChromeExtension(opts?: {
     throw new Error("Bundled Chrome extension is missing. Reinstall OpenClaw and try again.");
   }
 
-  const stateDir = opts?.stateDir ?? STATE_DIR;
+  const stateDir = opts?.stateDir ?? resolveStateDir();
   const dest = path.join(stateDir, "browser", "chrome-extension");
   fs.mkdirSync(path.dirname(dest), { recursive: true });
 
diff --git a/src/cli/config-cli.test.ts b/src/cli/config-cli.test.ts
index 85a109db47..6f144cb545 100644
--- a/src/cli/config-cli.test.ts
+++ b/src/cli/config-cli.test.ts
@@ -54,7 +54,6 @@ async function writeConfigFile(home: string, config: Record<string, unknown>): P
 describe("config cli", () => {
   beforeEach(() => {
     vi.clearAllMocks();
-    vi.resetModules();
   });
 
   afterEach(() => {
diff --git a/src/commands/message.e2e.test.ts b/src/commands/message.e2e.test.ts
index 81d9269c43..4c0b0d5106 100644
--- a/src/commands/message.e2e.test.ts
+++ b/src/commands/message.e2e.test.ts
@@ -61,7 +61,6 @@ beforeEach(async () => {
   process.env.TELEGRAM_BOT_TOKEN = "";
   process.env.DISCORD_BOT_TOKEN = "";
   testConfig = {};
-  vi.resetModules();
   await setRegistry(createTestRegistry([]));
   callGatewayMock.mockReset();
   webAuthExists.mockReset().mockResolvedValue(false);