@@ -42,12 +42,24 @@ export const apiProviderHygieneSelectors = [
 	},
 ]
 
+// Hand-built AbortError values drift from the shared contract (name, message). Use createAbortError.
+export const abortErrorSelectors = [
+	{
+		selector: "AssignmentExpression[left.property.name='name'][right.value='AbortError']",
+		message: "Use createAbortError from providers/utils/abort-signal instead of building an AbortError by hand.",
+	},
+	{
+		selector: "NewExpression[callee.name='DOMException'][arguments.1.value='AbortError']",
+		message: "Use createAbortError from providers/utils/abort-signal instead of building an AbortError by hand.",
+	},
+]
+
 export const apiProviderHygieneConfig = {
 	files: ["api/**/*.ts"],
 	// The helper module owns the shared names. Tests build their own fixtures.
 	ignores: ["api/providers/utils/abort-signal.ts", "**/__tests__/**", "**/*.test.ts", "**/*.spec.ts"],
 	rules: {
-		"no-restricted-syntax": ["error", ...apiProviderHygieneSelectors],
+		"no-restricted-syntax": ["error", ...apiProviderHygieneSelectors, ...abortErrorSelectors],
 	},
 }
 
@@ -59,3 +71,13 @@ export const apiProviderTestSelectors = [
 			"Use it.each for repeated cases. A loop of expects in one test stops at the first failing case and does not name it.",
 	},
 ]
+
+// A new @ts-ignore in a provider spec hides a private-member access. Use bracket notation or a typed double.
+// Ratchet: files that still hold one are listed here. Remove a file from the list when it is clean.
+export const apiSpecTsIgnoreConfig = {
+	files: ["api/**/__tests__/**/*.spec.ts"],
+	ignores: ["api/providers/__tests__/gemini-handler.spec.ts", "api/providers/__tests__/vscode-lm.spec.ts"],
+	rules: {
+		"@typescript-eslint/ban-ts-comment": ["error", { "ts-ignore": true }],
+	},
+}
@@ -4,7 +4,7 @@ import { describe, it } from "node:test"
 import { Linter } from "eslint"
 import typescriptEslint from "typescript-eslint"
 
-import { apiProviderHygieneConfig, apiProviderTestSelectors } from "./api-provider-hygiene.js"
+import { apiProviderHygieneConfig, apiProviderTestSelectors, apiSpecTsIgnoreConfig } from "./api-provider-hygiene.js"
 
 const linter = new Linter({ configType: "flat" })
 const config = [{ files: ["**/*.ts"], languageOptions: { parser: typescriptEslint.parser } }, apiProviderHygieneConfig]
@@ -174,3 +174,74 @@ describe("api provider hygiene: spec loops", () => {
 		})
 	}
 })
+
+describe("api provider hygiene: hand-built AbortError", () => {
+	for (const code of [
+		'const e = new Error("x"); e.name = "AbortError"',
+		'throw new DOMException("aborted", "AbortError")',
+		'Object.assign(new Error("x"), {}).name = "AbortError"',
+	]) {
+		it(`flags: ${code}`, () => {
+			assert.equal(lint(code).length, 1)
+		})
+	}
+
+	for (const code of [
+		'import { createAbortError } from "./utils/abort-signal"\nthrow createAbortError("X")',
+		'if (error.name === "AbortError") {}',
+		'const e = new Error("x"); e.name = "TimeoutError"',
+		'new DOMException("timed out", "TimeoutError")',
+	]) {
+		it(`allows: ${code}`, () => {
+			assert.deepEqual(lint(code), [])
+		})
+	}
+
+	it("does not apply to the helper module", () => {
+		assert.deepEqual(
+			lint('const e = new Error("x"); e.name = "AbortError"', "api/providers/utils/abort-signal.ts"),
+			[],
+		)
+	})
+
+	it("does not apply to tests", () => {
+		assert.deepEqual(lint('new DOMException("x", "AbortError")', "api/providers/__tests__/a.spec.ts"), [])
+	})
+})
+
+describe("api provider hygiene: @ts-ignore in specs", () => {
+	const specLinter = new Linter({ configType: "flat" })
+	const specConfig = [
+		{
+			files: ["**/*.ts"],
+			languageOptions: { parser: typescriptEslint.parser },
+			plugins: { "@typescript-eslint": typescriptEslint.plugin },
+		},
+		apiSpecTsIgnoreConfig,
+	]
+	const lintSpecFile = (code, filename = "api/providers/__tests__/example.spec.ts") =>
+		specLinter.verify(code, specConfig, { filename }).map((m) => m.message)
+
+	it("flags @ts-ignore in a spec", () => {
+		assert.equal(lintSpecFile("// @ts-ignore access private client\nhandler.client").length, 1)
+	})
+
+	it("allows @ts-expect-error with a description", () => {
+		assert.deepEqual(lintSpecFile("// @ts-expect-error private client\nhandler.client"), [])
+	})
+
+	it("allows bracket notation", () => {
+		assert.deepEqual(lintSpecFile('handler["client"]'), [])
+	})
+
+	it("skips files in the ratchet list", () => {
+		assert.deepEqual(
+			lintSpecFile("// @ts-ignore x\nhandler.client", "api/providers/__tests__/gemini-handler.spec.ts"),
+			[],
+		)
+	})
+
+	it("does not apply outside src/api", () => {
+		assert.deepEqual(lintSpecFile("// @ts-ignore x\nhandler.client", "services/__tests__/example.spec.ts"), [])
+	})
+})
@@ -12,8 +12,7 @@ vi.mock("@roo-code/telemetry", () => ({
 }))
 
 import { GeminiHandler } from "../gemini"
-import type { ApiHandlerOptions } from "../../../shared/api"
-import { providerIdentifiers } from "@roo-code/types/provider-identifiers"
+import { makeApiHandlerOptions } from "../../../test-utils/api"
 
 describe("GeminiHandler backend support", () => {
 	beforeEach(() => {
@@ -24,11 +23,7 @@ describe("GeminiHandler backend support", () => {
 		// URL context and grounding are mutually exclusive with function declarations
 		// in Gemini API, so createMessage only uses function declarations.
 		// URL context/grounding are only added in completePrompt.
-		const options = {
-			apiProvider: providerIdentifiers.gemini,
-			enableUrlContext: true,
-			enableGrounding: true,
-		} as ApiHandlerOptions
+		const options = makeApiHandlerOptions()
 		const handler = new GeminiHandler(options)
 		const stub = vi.fn().mockReturnValue((async function* () {})())
 		// @ts-ignore access private client
@@ -41,11 +36,7 @@ describe("GeminiHandler backend support", () => {
 	})
 
 	it("completePrompt passes config overrides without tools when URL context and grounding disabled", async () => {
-		const options = {
-			apiProvider: providerIdentifiers.gemini,
-			enableUrlContext: false,
-			enableGrounding: false,
-		} as ApiHandlerOptions
+		const options = makeApiHandlerOptions()
 		const handler = new GeminiHandler(options)
 		const stub = vi.fn().mockResolvedValue({ text: "ok" })
 		// @ts-ignore access private client
@@ -56,12 +47,39 @@ describe("GeminiHandler backend support", () => {
 		expect(promptConfig.tools).toBeUndefined()
 	})
 
+	it("completePrompt should pass abort signal through to client via config.abortSignal", async () => {
+		const options = makeApiHandlerOptions()
+		const handler = new GeminiHandler(options)
+
+		const controller = new AbortController()
+		const stub = vi.fn().mockResolvedValue({ text: "response" })
+		handler["client"].models.generateContent = stub
+
+		await handler.completePrompt("test prompt", { abortSignal: controller.signal })
+
+		expect(stub).toHaveBeenCalledWith(
+			expect.objectContaining({
+				config: expect.objectContaining({
+					abortSignal: controller.signal,
+				}),
+			}),
+		)
+	})
+
+	it("completePrompt should work without options (backward compatible)", async () => {
+		const options = makeApiHandlerOptions()
+		const handler = new GeminiHandler(options)
+
+		const stub = vi.fn().mockResolvedValue({ text: "response" })
+		handler["client"].models.generateContent = stub
+
+		const result = await handler.completePrompt("test prompt")
+		expect(result).toBe("response")
+	})
+
 	describe("error scenarios", () => {
 		it("should handle grounding metadata extraction failure gracefully", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-				enableGrounding: true,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 
 			const mockStream = async function* () {
@@ -93,10 +111,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should handle malformed grounding metadata", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-				enableGrounding: true,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 
 			const mockStream = async function* () {
@@ -144,11 +159,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should handle API errors when tools are enabled", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-				enableUrlContext: true,
-				enableGrounding: true,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 
 			const mockError = new Error("API rate limit exceeded")
@@ -192,9 +203,7 @@ describe("GeminiHandler backend support", () => {
 		]
 
 		it("should ignore allowedFunctionNames because Gemini rejects larger restriction lists", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -213,9 +222,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should include all tools when allowedFunctionNames is provided", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -236,9 +243,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should not pass large allowedFunctionNames lists to Gemini", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -267,9 +272,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should not pass allowedFunctionNames even when history includes tool calls", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -304,9 +307,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should fall back to tool_choice when allowedFunctionNames is provided", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -327,9 +328,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should fall back to tool_choice when allowedFunctionNames is empty", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -351,9 +350,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should not set toolConfig when allowedFunctionNames is undefined and no tool_choice", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -374,9 +371,7 @@ describe("GeminiHandler backend support", () => {
 
 	describe("Gemini schema compatibility", () => {
 		it("should strip broad JSON Schema metadata from function declarations", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -435,9 +430,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should collapse composition and type arrays in function declaration schemas", async () => {
-			const options = {
-				apiProvider: providerIdentifiers.gemini,
-			} as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -496,7 +489,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should deep-merge allOf fragments instead of overwriting earlier properties", async () => {
-			const options = { apiProvider: providerIdentifiers.gemini } as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -541,7 +534,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should resolve $ref entries before dropping $defs", async () => {
-			const options = { apiProvider: providerIdentifiers.gemini } as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -590,7 +583,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should preserve top-level properties and required entries when allOf is also present", async () => {
-			const options = { apiProvider: providerIdentifiers.gemini } as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -632,7 +625,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should stop recursive $ref expansion before the sanitized schema becomes cyclic", async () => {
-			const options = { apiProvider: providerIdentifiers.gemini } as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client
@@ -684,7 +677,7 @@ describe("GeminiHandler backend support", () => {
 		})
 
 		it("should preserve parameter names that collide with stripped schema keywords", async () => {
-			const options = { apiProvider: providerIdentifiers.gemini } as ApiHandlerOptions
+			const options = makeApiHandlerOptions()
 			const handler = new GeminiHandler(options)
 			const stub = vi.fn().mockReturnValue((async function* () {})())
 			// @ts-ignore access private client