chore: enforce registerSpy via biome lint and migrate all callsites

mcowger · mcowger · commit a25c528ce513 · 2026-04-10T12:57:11.000-07:00
Upgrades @biomejs/biome to 2.4.11 and enables a noRestrictedImports
rule that errors on bare spyOn imports from bun:test, with the message
"Use registerSpy instead of spyOn". Migrates all 16 violations across
the test suite to use registerSpy from test-utils.
diff --git a/biome.json b/biome.json
@@ -1,5 +1,5 @@
 {
-  "$schema": "https://biomejs.dev/schemas/2.4.4/schema.json",
+  "$schema": "https://biomejs.dev/schemas/2.4.11/schema.json",
   "files": {
     "includes": [
       "**",
@@ -35,7 +35,23 @@
     }
   },
   "linter": {
-    "enabled": false
+    "enabled": true,
+    "rules": {
+      "recommended": false,
+      "style": {
+        "noRestrictedImports": {
+          "level": "error",
+          "options": {
+            "paths": {
+              "bun:test": {
+                "importNames": ["spyOn"],
+                "message": "Use registerSpy instead of spyOn"
+              }
+            }
+          }
+        }
+      }
+    }
   },
   "assist": {
     "enabled": false
diff --git a/bun.lock b/bun.lock
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "plexus2",
   "module": "index.ts",
   "devDependencies": {
-    "@biomejs/biome": "^2.4.6",
+    "@biomejs/biome": "^2.4.11",
     "biome": "^0.3.3",
     "bun-types": "^1.3.10",
     "drizzle-kit": "0.31.10",
diff --git a/packages/backend/src/routes/inference/__tests__/images.test.ts b/packages/backend/src/routes/inference/__tests__/images.test.ts
@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach, spyOn } from 'bun:test';
+import { describe, it, expect, beforeEach } from 'bun:test';
 import { ImageTransformer } from '../../../transformers/image';
 import { DebugManager } from '../../../services/debug-manager';
 
diff --git a/packages/backend/src/routes/mcp/__tests__/mcp-routes.test.ts b/packages/backend/src/routes/mcp/__tests__/mcp-routes.test.ts
@@ -1,4 +1,5 @@
-import { describe, expect, test, mock, beforeAll, spyOn } from 'bun:test';
+import { describe, expect, test, mock, beforeAll } from 'bun:test';
+import { registerSpy } from '../../../../test/test-utils';
 import Fastify, { FastifyInstance } from 'fastify';
 import { setConfigForTesting } from '../../../config';
 import { registerMcpRoutes } from '../index';
@@ -27,7 +28,7 @@ describe('MCP Routes', () => {
     }));
 
     // Spy on the module and replace the function
-    spyOn(mcpProxyService, 'proxyMcpRequest').mockImplementation(mockProxyMcpRequest);
+    registerSpy(mcpProxyService, 'proxyMcpRequest').mockImplementation(mockProxyMcpRequest);
 
     // Set config with keys and MCP servers
     setConfigForTesting({
diff --git a/packages/backend/src/services/__tests__/aliases.test.ts b/packages/backend/src/services/__tests__/aliases.test.ts
@@ -1,4 +1,5 @@
-import { describe, expect, test, beforeEach, afterEach, spyOn } from 'bun:test';
+import { describe, expect, test, beforeEach, afterEach } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import { Router } from '../router';
 import { setConfigForTesting } from '../../config';
 import { CooldownManager } from '../cooldown-manager';
@@ -156,7 +157,7 @@ describe('Router.resolveCandidates', () => {
   const cooldownManager = CooldownManager.getInstance();
 
   afterEach(() => {
-    spyOn(cooldownManager, 'filterHealthyTargets').mockRestore();
+    registerSpy(cooldownManager, 'filterHealthyTargets').mockRestore();
   });
 
   test('returns empty array when model alias does not exist', async () => {
@@ -254,7 +255,7 @@ describe('Router.resolveCandidates', () => {
       keys: {},
     } as any);
 
-    spyOn(cooldownManager, 'filterHealthyTargets').mockResolvedValue([]);
+    registerSpy(cooldownManager, 'filterHealthyTargets').mockResolvedValue([]);
 
     const result = await Router.resolveCandidates('cooldown-model');
     expect(result).toEqual([]);
@@ -297,7 +298,7 @@ describe('Router.resolveCandidates', () => {
     } as any);
 
     // Simulate p1 being unhealthy after disabled filtering
-    spyOn(cooldownManager, 'filterHealthyTargets').mockResolvedValue([
+    registerSpy(cooldownManager, 'filterHealthyTargets').mockResolvedValue([
       { provider: 'p3', model: 'm3' },
     ] as any);
 
diff --git a/packages/backend/src/services/__tests__/debug-logging-error.test.ts b/packages/backend/src/services/__tests__/debug-logging-error.test.ts
@@ -1,4 +1,5 @@
-import { describe, expect, test, beforeEach, spyOn, mock } from 'bun:test';
+import { describe, expect, test, beforeEach, mock } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import { Dispatcher } from '../dispatcher';
 import { DebugManager } from '../debug-manager';
 import { setConfigForTesting } from '../../config';
@@ -15,7 +16,7 @@ describe('Dispatcher Error Logging', () => {
     debugManager.pendingLogs.clear();
 
     // Spy on DebugManager.addRawResponse
-    addRawResponseSpy = spyOn(debugManager, 'addRawResponse');
+    addRawResponseSpy = registerSpy(debugManager, 'addRawResponse');
   });
 
   test('Captures error response in debug log when upstream fails', async () => {
diff --git a/packages/backend/src/services/__tests__/dispatcher-bug-fix.test.ts b/packages/backend/src/services/__tests__/dispatcher-bug-fix.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test, beforeEach, spyOn, mock } from 'bun:test';
+import { describe, expect, test, beforeEach, mock } from 'bun:test';
 import { Dispatcher } from '../dispatcher';
 import { setConfigForTesting } from '../../config';
 import { UnifiedChatRequest } from '../../types/unified';
diff --git a/packages/backend/src/services/__tests__/usage-logging-metadata.test.ts b/packages/backend/src/services/__tests__/usage-logging-metadata.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeEach, afterEach, mock, spyOn } from 'bun:test';
+import { describe, it, expect, beforeEach, afterEach, mock } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import { PassThrough } from 'stream';
 import { UsageInspector } from '../inspectors/usage-logging';
 import { DebugManager } from '../debug-manager';
@@ -47,7 +48,7 @@ describe('UsageInspector Metadata Robustness', () => {
     dm.addReconstructedRawResponse(requestId, snapshot);
 
     let capturedRecord: UsageRecord | null = null;
-    spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+    registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
       capturedRecord = record;
       return Promise.resolve();
     });
@@ -141,7 +142,7 @@ describe('UsageInspector Metadata Robustness', () => {
     dm.addReconstructedRawResponse(requestId, snapshot);
 
     let capturedRecord: any = null;
-    spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: any) => {
+    registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: any) => {
       capturedRecord = record;
       return Promise.resolve();
     });
diff --git a/packages/backend/src/services/__tests__/usage-logging.test.ts b/packages/backend/src/services/__tests__/usage-logging.test.ts
@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeEach, afterEach, mock, spyOn } from 'bun:test';
+import { describe, it, expect, beforeEach, afterEach, mock } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import { PassThrough } from 'stream';
 import { UsageInspector } from '../inspectors/usage-logging';
 import { UsageStorageService } from '../usage-storage';
@@ -68,7 +69,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -115,7 +116,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -163,7 +164,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -208,7 +209,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -255,7 +256,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -304,7 +305,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
@@ -354,7 +355,7 @@ describe('UsageInspector', () => {
       const mockStream = new PassThrough();
 
       let capturedRecord: UsageRecord | null = null;
-      spyOn(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
+      registerSpy(mockStorage, 'saveRequest').mockImplementation(async (record: UsageRecord) => {
         capturedRecord = record;
         return Promise.resolve();
       });
diff --git a/packages/backend/src/services/__tests__/usage-storage-performance.test.ts b/packages/backend/src/services/__tests__/usage-storage-performance.test.ts
@@ -1,4 +1,5 @@
-import { afterEach, beforeEach, describe, expect, it, spyOn } from 'bun:test';
+import { afterEach, beforeEach, describe, expect, it } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import { UsageStorageService } from '../usage-storage';
 import { closeDatabase, getDatabase, getSchema, initializeDatabase } from '../../db/client';
 import { runMigrations } from '../../db/migrate';
@@ -364,12 +365,12 @@ describe('UsageStorageService performance metrics', () => {
     const storage = new UsageStorageService();
     const calls: string[] = [];
 
-    spyOn(storage, 'emitStarted').mockImplementation(async () => {
+    registerSpy(storage, 'emitStarted').mockImplementation(async () => {
       await new Promise((resolve) => setTimeout(resolve, 40));
       calls.push('started');
     });
 
-    spyOn(storage, 'emitUpdated').mockImplementation(async () => {
+    registerSpy(storage, 'emitUpdated').mockImplementation(async () => {
       calls.push('updated');
     });
 
diff --git a/packages/backend/src/services/mcp-proxy/__tests__/mcp-proxy-service.test.ts b/packages/backend/src/services/mcp-proxy/__tests__/mcp-proxy-service.test.ts
@@ -1,4 +1,4 @@
-import { describe, expect, test, mock, beforeEach, spyOn } from 'bun:test';
+import { describe, expect, test, mock, beforeEach } from 'bun:test';
 import {
   getMcpServerConfig,
   validateServerName,
diff --git a/packages/backend/src/services/quota/checkers/__tests__/openai-codex-checker.test.ts b/packages/backend/src/services/quota/checkers/__tests__/openai-codex-checker.test.ts
@@ -1,4 +1,5 @@
-import { beforeEach, describe, expect, it, mock, spyOn } from 'bun:test';
+import { beforeEach, describe, expect, it, mock } from 'bun:test';
+import { registerSpy } from '../../../../../test/test-utils';
 import type { QuotaCheckerConfig } from '../../../../types/quota';
 import { OpenAICodexQuotaChecker } from '../openai-codex-checker';
 import { QuotaCheckerFactory } from '../../quota-checker-factory';
@@ -234,7 +235,7 @@ describe('OpenAICodexQuotaChecker', () => {
     });
 
     const authManager = OAuthAuthManager.getInstance();
-    spyOn(authManager, 'getApiKey').mockResolvedValue(token);
+    registerSpy(authManager, 'getApiKey').mockResolvedValue(token);
 
     setFetchMock(
       async () =>
diff --git a/packages/backend/src/transformers/__tests__/oauth-transformer.test.ts b/packages/backend/src/transformers/__tests__/oauth-transformer.test.ts
@@ -1,4 +1,5 @@
-import { afterEach, beforeEach, describe, expect, mock, spyOn, test } from 'bun:test';
+import { afterEach, beforeEach, describe, expect, mock, test } from 'bun:test';
+import { registerSpy } from '../../../test/test-utils';
 import * as actualPiAi from '@mariozechner/pi-ai';
 import { OAuthAuthManager } from '../../services/oauth-auth-manager';
 
@@ -23,7 +24,7 @@ describe('OAuthTransformer', () => {
 
   test('skips proxy renaming for claude code agent headers', async () => {
     const authManager = OAuthAuthManager.getInstance();
-    spyOn(authManager, 'getApiKey').mockResolvedValue('sk-ant-oat-test');
+    registerSpy(authManager, 'getApiKey').mockResolvedValue('sk-ant-oat-test');
 
     const transformer = new OAuthTransformer();
     const context = {
@@ -47,7 +48,7 @@ describe('OAuthTransformer', () => {
 
   test('proxies tool names for non-claude code agents', async () => {
     const authManager = OAuthAuthManager.getInstance();
-    spyOn(authManager, 'getApiKey').mockResolvedValue('sk-ant-oat-test');
+    registerSpy(authManager, 'getApiKey').mockResolvedValue('sk-ant-oat-test');
 
     const transformer = new OAuthTransformer();
     const context = {
@@ -69,7 +70,7 @@ describe('OAuthTransformer', () => {
 
   test('uses direct API key for claude masking without OAuth auth manager', async () => {
     const authManager = OAuthAuthManager.getInstance();
-    const getApiKeySpy = spyOn(authManager, 'getApiKey');
+    const getApiKeySpy = registerSpy(authManager, 'getApiKey');
 
     const transformer = new OAuthTransformer();
     const context = {
diff --git a/packages/backend/test/test-utils.ts b/packages/backend/test/test-utils.ts
@@ -1,3 +1,4 @@
+// biome-ignore lint/style/noRestrictedImports: internal implementation of registerSpy
 import { spyOn, afterEach, type SpyInstance, type MockInstance } from 'bun:test';
 
 /**
@@ -93,4 +94,4 @@ export function createTrackedMock<T extends (...args: any[]) => any>(
 }
 
 // Re-export common test utilities for convenience
-export { describe, test, expect, beforeEach, afterEach, spyOn, mock } from 'bun:test';
+export { describe, test, expect, beforeEach, afterEach, mock } from 'bun:test';
diff --git a/packages/backend/test/vision-fallthrough-e2e.test.ts b/packages/backend/test/vision-fallthrough-e2e.test.ts
@@ -1,4 +1,5 @@
-import { expect, test, describe, beforeEach, afterEach, spyOn, mock } from 'bun:test';
+import { expect, test, describe, beforeEach, afterEach, mock } from 'bun:test';
+import { registerSpy } from './test-utils';
 import { Dispatcher } from '../src/services/dispatcher';
 import { VisionDescriptorService } from '../src/services/vision-descriptor-service';
 import { Router } from '../src/services/router';
@@ -45,7 +46,7 @@ describe('Vision Fallthrough E2E', () => {
     configModule.setConfigForTesting(mockConfig as any);
 
     // 2. Mock VisionDescriptorService.process to return a modified request
-    const processSpy = spyOn(VisionDescriptorService, 'process').mockImplementation(async (req) => {
+    const processSpy = registerSpy(VisionDescriptorService, 'process').mockImplementation(async (req) => {
       return {
         ...req,
         messages: [
@@ -55,7 +56,7 @@ describe('Vision Fallthrough E2E', () => {
     });
 
     // 3. Mock Router.resolveCandidates to return a valid candidate with the modelConfig
-    spyOn(Router, 'resolveCandidates').mockResolvedValue([
+    registerSpy(Router, 'resolveCandidates').mockResolvedValue([
       {
         provider: 'test-provider',
         model: 'text-model',
@@ -68,13 +69,13 @@ describe('Vision Fallthrough E2E', () => {
 
     // 4. Mock Dispatcher internal methods to prevent actual network calls
     const dispatcher = new Dispatcher();
-    spyOn(dispatcher as any, 'selectTargetApiType').mockReturnValue({
+    registerSpy(dispatcher as any, 'selectTargetApiType').mockReturnValue({
       targetApiType: 'chat',
       selectionReason: 'test',
     });
 
     // Mock the actual execution to return success
-    spyOn(dispatcher as any, 'executeProviderRequest').mockImplementation(async () => {
+    registerSpy(dispatcher as any, 'executeProviderRequest').mockImplementation(async () => {
       return {
         ok: true,
         json: async () => ({ choices: [{ message: { content: 'I see the description.' } }] }),
diff --git a/packages/backend/test/vision-fallthrough-full.test.ts b/packages/backend/test/vision-fallthrough-full.test.ts
diff --git a/packages/backend/test/vision-fallthrough-verification.test.ts b/packages/backend/test/vision-fallthrough-verification.test.ts

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { describe, it, expect, beforeEach, spyOn } from 'bun:test';`
	`1`	`+import { describe, it, expect, beforeEach } from 'bun:test';`
`2`	`2`	`import { ImageTransformer } from '../../../transformers/image';`
`3`	`3`	`import { DebugManager } from '../../../services/debug-manager';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { describe, expect, test, beforeEach, spyOn, mock } from 'bun:test';`
	`1`	`+import { describe, expect, test, beforeEach, mock } from 'bun:test';`
`2`	`2`	`import { Dispatcher } from '../dispatcher';`
`3`	`3`	`import { setConfigForTesting } from '../../config';`
`4`	`4`	`import { UnifiedChatRequest } from '../../types/unified';`