Fix all linter errors (and fix the lint scripts too) (#2958)

Author: cte

package.json

@@ -364,7 +364,7 @@
 		"install-webview": "cd webview-ui && npm install",
 		"install-e2e": "cd e2e && npm install",
 		"lint": "npm-run-all -l -p lint:*",
-		"lint:extension": "eslint src/**/*.ts",
+		"lint:extension": "eslint src --ext .ts",
 		"lint:webview": "cd webview-ui && npm run lint",
 		"lint:e2e": "cd e2e && npm run lint",
 		"check-types": "npm-run-all -l -p check-types:*",

src/__mocks__/fs/promises.ts

@@ -24,26 +24,6 @@ const baseTestDirs = [
 	"/test/log/path",
 ]
 
-// Helper function to format instructions
-const formatInstructions = (sections: string[]): string => {
-	const joinedSections = sections.filter(Boolean).join("\n\n")
-	return joinedSections
-		? `
-====
-
-USER'S CUSTOM INSTRUCTIONS
-
-The following additional instructions are provided by the user, and should be followed to the best of your ability without interfering with the TOOL USE guidelines.
-
-${joinedSections}`
-		: ""
-}
-
-// Helper function to format rule content
-const formatRuleContent = (ruleFile: string, content: string): string => {
-	return `Rules:\n# Rules from ${ruleFile}:\n${content}`
-}
-
 type RuleFiles = {
 	".clinerules-code": string
 	".clinerules-ask": string
@@ -65,7 +45,7 @@ const ensureDirectoryExists = (path: string) => {
 }
 
 const mockFs = {
-	readFile: jest.fn().mockImplementation(async (filePath: string, encoding?: string) => {
+	readFile: jest.fn().mockImplementation(async (filePath: string, _encoding?: string) => {
 		// Return stored content if it exists
 		if (mockFiles.has(filePath)) {
 			return mockFiles.get(filePath)

src/__mocks__/services/ripgrep/index.ts

@@ -13,7 +13,7 @@
  * @param vscodeAppRoot - Optional VSCode app root path (can be undefined)
  * @returns Promise resolving to a mock path to the ripgrep binary
  */
-export const getBinPath = jest.fn().mockImplementation(async (vscodeAppRoot?: string): Promise<string> => {
+export const getBinPath = jest.fn().mockImplementation(async (_vscodeAppRoot?: string): Promise<string> => {
 	return "/mock/path/to/rg"
 })
 
@@ -30,7 +30,7 @@ export const getBinPath = jest.fn().mockImplementation(async (vscodeAppRoot?: st
 export const regexSearchFiles = jest
 	.fn()
 	.mockImplementation(
-		async (cwd?: string, directoryPath?: string, regex?: string, filePattern?: string): Promise<string> => {
+		async (_cwd?: string, _directoryPath?: string, _regex?: string, _filePattern?: string): Promise<string> => {
 			return "Mock search results"
 		},
 	)
@@ -43,6 +43,6 @@ export const regexSearchFiles = jest
  * @param maxLength - Optional maximum length (can be undefined)
  * @returns The original line or empty string if undefined
  */
-export const truncateLine = jest.fn().mockImplementation((line?: string, maxLength?: number): string => {
+export const truncateLine = jest.fn().mockImplementation((line?: string, _maxLength?: number): string => {
 	return line || ""
 })

src/api/index.ts

@@ -77,7 +77,7 @@ export function buildApiHandler(configuration: ApiConfiguration): ApiHandler {
 		case "requesty":
 			return new RequestyHandler(options)
 		case "human-relay":
-			return new HumanRelayHandler(options)
+			return new HumanRelayHandler()
 		case "fake-ai":
 			return new FakeAIHandler(options)
 		case "xai":

src/api/providers/__tests__/bedrock-custom-arn.test.ts

@@ -1,3 +1,5 @@
+// npx jest src/api/providers/__tests__/bedrock-custom-arn.test.ts
+
 import { AwsBedrockHandler } from "../bedrock"
 import { ApiHandlerOptions } from "../../../shared/api"
 import { logger } from "../../../utils/logging"
@@ -52,9 +54,6 @@ jest.mock("@aws-sdk/client-bedrock-runtime", () => {
 	}
 })
 
-// Get mock module for testing
-const bedrockMock = jest.requireMock("@aws-sdk/client-bedrock-runtime").__mock
-
 describe("Bedrock ARN Handling", () => {
 	// Helper function to create a handler with specific options
 	const createHandler = (options: Partial<ApiHandlerOptions> = {}) => {
@@ -236,7 +235,8 @@ describe("Bedrock ARN Handling", () => {
 			// Create handler with ARN region different from provided region
 			const arn =
 				"arn:aws:bedrock:eu-west-1:123456789012:inference-profile/anthropic.claude-3-sonnet-20240229-v1:0"
-			const handler = createHandler({
+
+			createHandler({
 				awsCustomArn: arn,
 				awsRegion: "us-east-1", // Different from ARN region
 			})

src/api/providers/__tests__/bedrock-invokedModelId.test.ts

@@ -1,3 +1,9 @@
+// npx jest src/api/providers/__tests__/bedrock-invokedModelId.test.ts
+
+import { ApiHandlerOptions } from "../../../shared/api"
+
+import { AwsBedrockHandler, StreamEvent } from "../bedrock"
+
 // Mock AWS SDK credential providers and Bedrock client
 jest.mock("@aws-sdk/credential-providers", () => ({
 	fromIni: jest.fn().mockReturnValue({
@@ -62,11 +68,6 @@ jest.mock("@aws-sdk/client-bedrock-runtime", () => {
 	}
 })
 
-import { AwsBedrockHandler, StreamEvent } from "../bedrock"
-import { ApiHandlerOptions } from "../../../shared/api"
-import { BedrockRuntimeClient } from "@aws-sdk/client-bedrock-runtime"
-const { fromIni } = require("@aws-sdk/credential-providers")
-
 describe("AwsBedrockHandler with invokedModelId", () => {
 	let mockSend: jest.Mock
 
@@ -279,17 +280,6 @@ describe("AwsBedrockHandler with invokedModelId", () => {
 			}
 		})
 
-		// Mock getModel to return expected values
-		const getModelSpy = jest.spyOn(handler, "getModel").mockReturnValue({
-			id: "anthropic.claude-3-5-sonnet-20241022-v2:0",
-			info: {
-				maxTokens: 4096,
-				contextWindow: 128_000,
-				supportsPromptCache: false,
-				supportsImages: true,
-			},
-		})
-
 		// Create a message generator
 		const messageGenerator = handler.createMessage("system prompt", [{ role: "user", content: "user message" }])
 

src/api/providers/__tests__/bedrock.test.ts

@@ -22,11 +22,8 @@ jest.mock("@aws-sdk/client-bedrock-runtime", () => ({
 }))
 
 import { AwsBedrockHandler } from "../bedrock"
-import { MessageContent } from "../../../shared/api"
-import { BedrockRuntimeClient, ConverseStreamCommand } from "@aws-sdk/client-bedrock-runtime"
+
 import { Anthropic } from "@anthropic-ai/sdk"
-const { fromIni } = require("@aws-sdk/credential-providers")
-import { logger } from "../../../utils/logging"
 
 describe("AwsBedrockHandler", () => {
 	let handler: AwsBedrockHandler

src/api/providers/__tests__/gemini.test.ts

@@ -95,7 +95,7 @@ describe("GeminiHandler", () => {
 			const stream = handler.createMessage(systemPrompt, mockMessages)
 
 			await expect(async () => {
-				for await (const chunk of stream) {
+				for await (const _chunk of stream) {
 					// Should throw before yielding any chunks
 				}
 			}).rejects.toThrow()

src/api/providers/__tests__/lmstudio.test.ts

@@ -1,7 +1,7 @@
+import { Anthropic } from "@anthropic-ai/sdk"
+
 import { LmStudioHandler } from "../lmstudio"
 import { ApiHandlerOptions } from "../../../shared/api"
-import OpenAI from "openai"
-import { Anthropic } from "@anthropic-ai/sdk"
 
 // Mock OpenAI client
 const mockCreate = jest.fn()
@@ -120,7 +120,7 @@ describe("LmStudioHandler", () => {
 			const stream = handler.createMessage(systemPrompt, messages)
 
 			await expect(async () => {
-				for await (const chunk of stream) {
+				for await (const _chunk of stream) {
 					// Should not reach here
 				}
 			}).rejects.toThrow("Please check the LM Studio developer logs to debug what went wrong")

src/api/providers/__tests__/mistral.test.ts

@@ -1,6 +1,7 @@
-import { MistralHandler } from "../mistral"
-import { ApiHandlerOptions, mistralDefaultModelId } from "../../../shared/api"
 import { Anthropic } from "@anthropic-ai/sdk"
+
+import { MistralHandler } from "../mistral"
+import { ApiHandlerOptions } from "../../../shared/api"
 import { ApiStreamTextChunk } from "../../transform/stream"
 
 // Mock Mistral client
@@ -9,7 +10,7 @@ jest.mock("@mistralai/mistralai", () => {
 	return {
 		Mistral: jest.fn().mockImplementation(() => ({
 			chat: {
-				stream: mockCreate.mockImplementation(async (options) => {
+				stream: mockCreate.mockImplementation(async (_options) => {
 					const stream = {
 						[Symbol.asyncIterator]: async function* () {
 							yield {