diff --git a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
index 439ca90eb02..04dcc120b4d 100644
--- a/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
+++ b/src/agents/pi-embedded-runner.run-embedded-pi-agent.auth-profile-rotation.e2e.test.ts
@@ -20,7 +20,7 @@ beforeAll(async () => {
 
 beforeEach(() => {
   vi.useRealTimers();
-  runEmbeddedAttemptMock.mockReset();
+  runEmbeddedAttemptMock.mockClear();
 });
 
 const baseUsage = {
diff --git a/src/auto-reply/reply/abort.test.ts b/src/auto-reply/reply/abort.test.ts
index e1c1204f561..c9ef99828aa 100644
--- a/src/auto-reply/reply/abort.test.ts
+++ b/src/auto-reply/reply/abort.test.ts
@@ -337,7 +337,7 @@ describe("abort detection", () => {
   });
 
   it("cascade stop traverses ended depth-1 parents to stop active depth-2 children", async () => {
-    subagentRegistryMocks.listSubagentRunsForRequester.mockReset();
+    subagentRegistryMocks.listSubagentRunsForRequester.mockClear();
     subagentRegistryMocks.markSubagentRunTerminated.mockClear();
     const root = await fs.mkdtemp(path.join(os.tmpdir(), "openclaw-abort-"));
     const storePath = path.join(root, "sessions.json");
diff --git a/src/browser/pw-session.create-page.navigation-guard.test.ts b/src/browser/pw-session.create-page.navigation-guard.test.ts
index ec9779fe8d8..95a09273001 100644
--- a/src/browser/pw-session.create-page.navigation-guard.test.ts
+++ b/src/browser/pw-session.create-page.navigation-guard.test.ts
@@ -54,8 +54,8 @@ function installBrowserMocks() {
 }
 
 afterEach(async () => {
-  connectOverCdpSpy.mockReset();
-  getChromeWebSocketUrlSpy.mockReset();
+  connectOverCdpSpy.mockClear();
+  getChromeWebSocketUrlSpy.mockClear();
   await closePlaywrightBrowserConnection().catch(() => {});
 });
 
diff --git a/src/cli/devices-cli.test.ts b/src/cli/devices-cli.test.ts
index 0ee556e3c46..7d6abba39b0 100644
--- a/src/cli/devices-cli.test.ts
+++ b/src/cli/devices-cli.test.ts
@@ -288,7 +288,7 @@ describe("devices cli local fallback", () => {
 });
 
 afterEach(() => {
-  callGateway.mockReset();
+  callGateway.mockClear();
   buildGatewayConnectionDetails.mockClear();
   buildGatewayConnectionDetails.mockReturnValue({
     url: "ws://127.0.0.1:18789",
diff --git a/src/commands/models/list.status.e2e.test.ts b/src/commands/models/list.status.e2e.test.ts
index b2db4d922c0..2da3269db2b 100644
--- a/src/commands/models/list.status.e2e.test.ts
+++ b/src/commands/models/list.status.e2e.test.ts
@@ -118,6 +118,11 @@ vi.mock("../../config/config.js", async (importOriginal) => {
 
 import { modelsStatusCommand } from "./list.status-command.js";
 
+const defaultResolveAgentModelPrimaryImpl = mocks.resolveAgentModelPrimary.getMockImplementation();
+const defaultResolveAgentModelFallbacksOverrideImpl =
+  mocks.resolveAgentModelFallbacksOverride.getMockImplementation();
+const defaultResolveEnvApiKeyImpl = mocks.resolveEnvApiKey.getMockImplementation();
+
 const runtime = {
   log: vi.fn(),
   error: vi.fn(),
@@ -156,12 +161,14 @@ async function withAgentScopeOverrides<T>(
     if (originalPrimary) {
       mocks.resolveAgentModelPrimary.mockImplementation(originalPrimary);
     } else {
-      mocks.resolveAgentModelPrimary.mockReset();
+      mocks.resolveAgentModelPrimary.mockImplementation(defaultResolveAgentModelPrimaryImpl);
     }
     if (originalFallbacks) {
       mocks.resolveAgentModelFallbacksOverride.mockImplementation(originalFallbacks);
     } else {
-      mocks.resolveAgentModelFallbacksOverride.mockReset();
+      mocks.resolveAgentModelFallbacksOverride.mockImplementation(
+        defaultResolveAgentModelFallbacksOverrideImpl,
+      );
     }
     if (originalAgentDir) {
       mocks.resolveAgentDir.mockImplementation(originalAgentDir);
@@ -270,7 +277,7 @@ describe("modelsStatusCommand auth overview", () => {
       if (originalEnvImpl) {
         mocks.resolveEnvApiKey.mockImplementation(originalEnvImpl);
       } else {
-        mocks.resolveEnvApiKey.mockReset();
+        mocks.resolveEnvApiKey.mockImplementation(defaultResolveEnvApiKeyImpl);
       }
     }
   });
diff --git a/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.e2e.test.ts b/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.e2e.test.ts
index d35e6fa81e0..d94de8a6486 100644
--- a/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.e2e.test.ts
+++ b/src/cron/isolated-agent.uses-last-non-empty-agent-text-as.e2e.test.ts
@@ -101,7 +101,7 @@ async function runCronTurn(home: string, options: RunCronTurnOptions = {}) {
   const storePath = options.storePath ?? (await writeSessionStore(home, options.storeEntries));
   const deps = options.deps ?? makeDeps();
   if (options.mockTexts === null) {
-    vi.mocked(runEmbeddedPiAgent).mockReset();
+    vi.mocked(runEmbeddedPiAgent).mockClear();
   } else {
     mockEmbeddedTexts(options.mockTexts ?? ["ok"]);
   }
@@ -158,7 +158,7 @@ async function runTurnWithStoredModelOverride(
 
 describe("runCronIsolatedAgentTurn", () => {
   beforeEach(() => {
-    vi.mocked(runEmbeddedPiAgent).mockReset();
+    vi.mocked(runEmbeddedPiAgent).mockClear();
     vi.mocked(loadModelCatalog).mockResolvedValue([]);
   });
 
diff --git a/src/hooks/gmail-setup-utils.test.ts b/src/hooks/gmail-setup-utils.test.ts
index 1d4c81c0fd8..bf63651e18f 100644
--- a/src/hooks/gmail-setup-utils.test.ts
+++ b/src/hooks/gmail-setup-utils.test.ts
@@ -17,7 +17,7 @@ vi.mock("../process/exec.js", () => ({
 }));
 
 beforeEach(() => {
-  runCommandWithTimeoutMock.mockReset();
+  runCommandWithTimeoutMock.mockClear();
   resetGmailSetupUtilsCachesForTest();
 });
 
diff --git a/src/media/store.redirect.test.ts b/src/media/store.redirect.test.ts
index 54c44109b8b..fd07ce69005 100644
--- a/src/media/store.redirect.test.ts
+++ b/src/media/store.redirect.test.ts
@@ -38,7 +38,7 @@ describe("media store redirects", () => {
   });
 
   beforeEach(() => {
-    mockRequest.mockReset();
+    mockRequest.mockClear();
     setMediaStoreNetworkDepsForTest({
       httpRequest: (...args) => mockRequest(...args),
       httpsRequest: (...args) => mockRequest(...args),