test: make constructor mocks constructable

Author: maxdewald

packages/cloud/src/__tests__/CloudService.test.ts

@@ -147,13 +147,21 @@ describe("CloudService", () => {
 			backfillMessages: vi.fn().mockResolvedValue(undefined),
 		}
 
-		vi.mocked(WebAuthService).mockImplementation(() => mockAuthService as unknown as WebAuthService)
+		vi.mocked(WebAuthService).mockImplementation(function () {
+			return mockAuthService as unknown as WebAuthService
+		})
 
-		vi.mocked(CloudSettingsService).mockImplementation(() => mockSettingsService as unknown as CloudSettingsService)
+		vi.mocked(CloudSettingsService).mockImplementation(function () {
+			return mockSettingsService as unknown as CloudSettingsService
+		})
 
-		vi.mocked(CloudShareService).mockImplementation(() => mockShareService as unknown as CloudShareService)
+		vi.mocked(CloudShareService).mockImplementation(function () {
+			return mockShareService as unknown as CloudShareService
+		})
 
-		vi.mocked(TelemetryClient).mockImplementation(() => mockTelemetryClient as unknown as TelemetryClient)
+		vi.mocked(TelemetryClient).mockImplementation(function () {
+			return mockTelemetryClient as unknown as TelemetryClient
+		})
 	})
 
 	afterEach(() => {
@@ -417,7 +425,9 @@ describe("CloudService", () => {
 			})
 
 			// Override the mock to return our properly typed instance
-			vi.mocked(CloudSettingsService).mockImplementation(() => mockCloudSettingsService)
+			vi.mocked(CloudSettingsService).mockImplementation(function () {
+				return mockCloudSettingsService
+			})
 
 			const cloudService = await CloudService.createInstance(mockContext)
 
@@ -450,9 +460,9 @@ describe("CloudService", () => {
 			}
 
 			// Override the mock to return a service that won't pass instanceof check
-			vi.mocked(CloudSettingsService).mockImplementation(
-				() => mockStaticSettingsService as unknown as CloudSettingsService,
-			)
+			vi.mocked(CloudSettingsService).mockImplementation(function () {
+				return mockStaticSettingsService as unknown as CloudSettingsService
+			})
 
 			// This should not throw even though the service doesn't pass instanceof check
 			const _cloudService = await CloudService.createInstance(mockContext)

packages/cloud/src/__tests__/CloudShareService.test.ts

@@ -302,7 +302,7 @@ describe("CloudShareService", () => {
 		})
 
 		it("should handle errors gracefully", async () => {
-			;(mockSettingsService.getSettings as any).mockImplementation(() => {
+			;(mockSettingsService.getSettings as any).mockImplementation(function () {
 				throw new Error("Settings error")
 			})
 

packages/cloud/src/__tests__/StaticSettingsService.test.ts

@@ -81,7 +81,7 @@ describe("StaticSettingsService", () => {
 		})
 
 		it("should use console.log as default logger for errors", () => {
-			const consoleSpy = vi.spyOn(console, "log").mockImplementation(() => {})
+			const consoleSpy = vi.spyOn(console, "log").mockImplementation(function () {})
 			expect(() => new StaticSettingsService("invalid-base64!@#")).toThrow()
 
 			expect(consoleSpy).toHaveBeenCalledWith(

packages/cloud/src/__tests__/TelemetryClient.test.ts

@@ -50,8 +50,8 @@ describe("TelemetryClient", () => {
 			json: vi.fn().mockResolvedValue({}),
 		})
 
-		vi.spyOn(console, "info").mockImplementation(() => {})
-		vi.spyOn(console, "error").mockImplementation(() => {})
+		vi.spyOn(console, "info").mockImplementation(function () {})
+		vi.spyOn(console, "error").mockImplementation(function () {})
 	})
 
 	afterEach(() => {

packages/cloud/src/__tests__/WebAuthService.spec.ts

@@ -97,7 +97,9 @@ describe("WebAuthService", () => {
 			reset: vi.fn(),
 		}
 		const MockedRefreshTimer = vi.mocked(RefreshTimer)
-		MockedRefreshTimer.mockImplementation(() => mockTimer as unknown as RefreshTimer)
+		MockedRefreshTimer.mockImplementation(function () {
+			return mockTimer as unknown as RefreshTimer
+		})
 
 		// Setup config mocks - use production URL by default to maintain existing test behavior
 		vi.mocked(getClerkBaseUrl).mockReturnValue("https://clerk.roocode.com")
@@ -211,7 +213,7 @@ describe("WebAuthService", () => {
 		it("should handle credentials change events", async () => {
 			let onDidChangeCallback: (e: { key: string }) => void
 
-			mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => {
+			mockContext.secrets.onDidChange.mockImplementation(function (callback: (e: { key: string }) => void) {
 				onDidChangeCallback = callback
 				return { dispose: vi.fn() }
 			})
@@ -302,7 +304,7 @@ describe("WebAuthService", () => {
 		})
 
 		it("should handle errors during login", async () => {
-			vi.mocked(crypto.randomBytes).mockImplementation(() => {
+			vi.mocked(crypto.randomBytes).mockImplementation(function () {
 				throw new Error("Crypto error")
 			})
 
@@ -1190,7 +1192,7 @@ describe("WebAuthService", () => {
 
 			let onDidChangeCallback: (e: { key: string }) => void
 
-			mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => {
+			mockContext.secrets.onDidChange.mockImplementation(function (callback: (e: { key: string }) => void) {
 				onDidChangeCallback = callback
 				return { dispose: vi.fn() }
 			})
@@ -1220,7 +1222,7 @@ describe("WebAuthService", () => {
 
 			let onDidChangeCallback: (e: { key: string }) => void
 
-			mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => {
+			mockContext.secrets.onDidChange.mockImplementation(function (callback: (e: { key: string }) => void) {
 				onDidChangeCallback = callback
 				return { dispose: vi.fn() }
 			})
@@ -1246,7 +1248,7 @@ describe("WebAuthService", () => {
 
 			let onDidChangeCallback: (e: { key: string }) => void
 
-			mockContext.secrets.onDidChange.mockImplementation((callback: (e: { key: string }) => void) => {
+			mockContext.secrets.onDidChange.mockImplementation(function (callback: (e: { key: string }) => void) {
 				onDidChangeCallback = callback
 				return { dispose: vi.fn() }
 			})

packages/cloud/src/retry-queue/__tests__/RetryQueue.test.ts

@@ -403,7 +403,9 @@ describe("RetryQueue", () => {
 			await retryQueue.enqueue("https://api.example.com/test", { method: "POST" }, "telemetry")
 
 			// Mock a slow response
-			fetchMock.mockImplementation(() => new Promise((resolve) => setTimeout(() => resolve({ ok: true }), 100)))
+			fetchMock.mockImplementation(function () {
+				return new Promise((resolve) => setTimeout(() => resolve({ ok: true }), 100))
+			})
 
 			// Start first retryAll (don't await)
 			const firstCall = retryQueue.retryAll()

src/__tests__/extension.spec.ts

@@ -158,17 +158,21 @@ vi.mock("../utils/autoImportSettings", () => ({
 }))
 
 vi.mock("../extension/api", () => ({
-	API: vi.fn().mockImplementation(() => ({})),
+	API: vi.fn().mockImplementation(function () {
+		return {}
+	}),
 }))
 
 vi.mock("../activate", () => ({
 	handleUri: vi.fn(),
 	registerCommands: vi.fn(),
 	registerCodeActions: vi.fn(),
 	registerTerminalActions: vi.fn(),
-	CodeActionProvider: vi.fn().mockImplementation(() => ({
-		providedCodeActionKinds: [],
-	})),
+	CodeActionProvider: vi.fn().mockImplementation(function () {
+		return {
+			providedCodeActionKinds: [],
+		}
+	}),
 }))
 
 vi.mock("../i18n", () => ({
@@ -192,7 +196,9 @@ vi.mock("../core/webview/ClineProvider", async () => {
 	}
 	return {
 		ClineProvider: Object.assign(
-			vi.fn().mockImplementation(() => mockInstance),
+			vi.fn().mockImplementation(function () {
+				return mockInstance
+			}),
 			{
 				// Static method used by extension.ts
 				getVisibleInstance: vi.fn().mockReturnValue(mockInstance),
@@ -270,7 +276,7 @@ describe("extension.ts", () => {
 			const { CloudService } = await import("@roo-code/cloud")
 			const { ClineProvider } = await import("../core/webview/ClineProvider")
 
-			vi.mocked(CloudService.createInstance).mockImplementation(async (_context, _logger, handlers) => {
+			vi.mocked(CloudService.createInstance).mockImplementation(async function (_context, _logger, handlers) {
 				if (handlers?.["auth-state-changed"]) {
 					authStateChangedHandler = handlers["auth-state-changed"]
 				}

src/__tests__/history-resume-delegation.spec.ts

@@ -457,7 +457,7 @@ describe("History resume delegation - parent metadata transitions", () => {
 
 		const provider = {
 			contextProxy: { globalStorageUri: { fsPath: "/tmp" } },
-			getTaskWithId: vi.fn().mockImplementation(async (id: string) => {
+			getTaskWithId: vi.fn().mockImplementation(async function (id: string) {
 				if (id === "parent-rpd06") {
 					return {
 						historyItem: {
@@ -580,7 +580,7 @@ describe("History resume delegation - parent metadata transitions", () => {
 
 		const provider = {
 			contextProxy: { globalStorageUri: { fsPath: "/tmp" } },
-			getTaskWithId: vi.fn().mockImplementation(async (id: string) => {
+			getTaskWithId: vi.fn().mockImplementation(async function (id: string) {
 				if (id === "parent-rpd02") {
 					return {
 						historyItem: {
@@ -651,7 +651,7 @@ describe("History resume delegation - parent metadata transitions", () => {
 			overwriteApiConversationHistory: vi.fn().mockResolvedValue(undefined),
 		}
 
-		const updateTaskHistory = vi.fn().mockImplementation(async (historyItem: { id?: string }) => {
+		const updateTaskHistory = vi.fn().mockImplementation(async function (historyItem: { id?: string }) {
 			if (historyItem.id === "child-rpd04") {
 				throw new Error("child status persist failed")
 			}
@@ -660,7 +660,7 @@ describe("History resume delegation - parent metadata transitions", () => {
 
 		const provider = {
 			contextProxy: { globalStorageUri: { fsPath: "/tmp" } },
-			getTaskWithId: vi.fn().mockImplementation(async (id: string) => {
+			getTaskWithId: vi.fn().mockImplementation(async function (id: string) {
 				if (id === "parent-rpd04") {
 					return {
 						historyItem: {

src/__tests__/migrateSettings.spec.ts

@@ -62,7 +62,7 @@ describe("Settings Migration", () => {
 		const mockRename = vitest.mocked(fs.rename).mockResolvedValue(undefined)
 
 		// Mock file existence checks - only return true for paths we want to exist
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyClineCustomModesPath) return true
 			return false // All other paths don't exist, including destination files
@@ -83,7 +83,7 @@ describe("Settings Migration", () => {
 		const mockRename = vitest.mocked(fs.rename).mockResolvedValue(undefined)
 
 		// Ensure the other files don't interfere with this test
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyMcpSettingsPath) return true
 			if (path === legacyClineCustomModesPath) return false // Ensure this file doesn't exist
@@ -106,7 +106,7 @@ describe("Settings Migration", () => {
 		const mockRename = vitest.mocked(fs.rename).mockResolvedValue(undefined)
 
 		// Mock file existence checks - both source and destination exist
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyClineCustomModesPath) return true
 			if (path === legacyCustomModesJson) return true // Destination already exists
@@ -147,15 +147,15 @@ describe("Settings Migration", () => {
 		const mockUnlink = vitest.mocked(fs.unlink).mockResolvedValue(undefined)
 
 		// Mock file read to return JSON content
-		vitest.mocked(fs.readFile).mockImplementation(async (path: any) => {
+		vitest.mocked(fs.readFile).mockImplementation(async function (path: any) {
 			if (path === legacyCustomModesJson) {
 				return testJsonContent
 			}
 			throw new Error("File not found: " + path)
 		})
 
 		// Isolate this test by making sure only the specific JSON file exists
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyCustomModesJson) return true
 			if (path === legacyClineCustomModesPath) return false
@@ -185,15 +185,15 @@ describe("Settings Migration", () => {
 		const mockUnlink = vitest.mocked(fs.unlink).mockResolvedValue(undefined)
 
 		// Mock file read to return corrupt JSON
-		vitest.mocked(fs.readFile).mockImplementation(async (path: any) => {
+		vitest.mocked(fs.readFile).mockImplementation(async function (path: any) {
 			if (path === legacyCustomModesJson) {
 				return "{ invalid json content" // This will cause an error when parsed
 			}
 			throw new Error("File not found: " + path)
 		})
 
 		// Isolate this test
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyCustomModesJson) return true
 			if (path === legacyClineCustomModesPath) return false
@@ -222,15 +222,15 @@ describe("Settings Migration", () => {
 		const mockUnlink = vitest.mocked(fs.unlink).mockResolvedValue(undefined)
 
 		// Mock file read
-		vitest.mocked(fs.readFile).mockImplementation(async (path: any) => {
+		vitest.mocked(fs.readFile).mockImplementation(async function (path: any) {
 			if (path === legacyCustomModesJson) {
 				return JSON.stringify({ customModes: [] })
 			}
 			throw new Error("File not found: " + path)
 		})
 
 		// Mock file existence checks - both source and yaml destination exist
-		vitest.mocked(fileExistsAtPath).mockImplementation(async (path: string) => {
+		vitest.mocked(fileExistsAtPath).mockImplementation(async function (path: string) {
 			if (path === mockSettingsDir) return true
 			if (path === legacyCustomModesJson) return true
 			if (path === newCustomModesYaml) return true // YAML already exists

src/__tests__/nested-delegation-resume.spec.ts

@@ -111,25 +111,26 @@ describe("Nested delegation resume (A → B → C)", () => {
 		}
 
 		const emitSpy = vi.fn()
-		const removeClineFromStack = vi.fn().mockImplementation(async () => {
+		const removeClineFromStack = vi.fn().mockImplementation(async function () {
 			// Simulate closing current child
 			currentActiveId = undefined
 		})
-		const createTaskWithHistoryItem = vi
-			.fn()
-			.mockImplementation(async (historyItem: any, opts?: { startTask?: boolean }) => {
-				// Assert startTask:false to avoid resume asks
-				expect(opts).toEqual(expect.objectContaining({ startTask: false }))
-				// Reopen the parent
-				currentActiveId = historyItem.id
-				// Return minimal parent instance with resumeAfterDelegation
-				return {
-					taskId: historyItem.id,
-					resumeAfterDelegation: vi.fn().mockResolvedValue(undefined),
-					overwriteClineMessages: vi.fn().mockResolvedValue(undefined),
-					overwriteApiConversationHistory: vi.fn().mockResolvedValue(undefined),
-				}
-			})
+		const createTaskWithHistoryItem = vi.fn().mockImplementation(async function (
+			historyItem: any,
+			opts?: { startTask?: boolean },
+		) {
+			// Assert startTask:false to avoid resume asks
+			expect(opts).toEqual(expect.objectContaining({ startTask: false }))
+			// Reopen the parent
+			currentActiveId = historyItem.id
+			// Return minimal parent instance with resumeAfterDelegation
+			return {
+				taskId: historyItem.id,
+				resumeAfterDelegation: vi.fn().mockResolvedValue(undefined),
+				overwriteClineMessages: vi.fn().mockResolvedValue(undefined),
+				overwriteApiConversationHistory: vi.fn().mockResolvedValue(undefined),
+			}
+		})
 
 		const getTaskWithId = vi.fn(async (id: string) => {
 			if (!historyIndex[id]) throw new Error("Task not found")