fix(api-providers): fix timeout handling and abort signal issues in completePrompt

Author: easonliang28

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

@@ -182,6 +182,17 @@ describe("LmStudioHandler", () => {
 			)
 		})
 
+		it("should pass timeoutMs=0 through to client", async () => {
+			mockCreate.mockResolvedValueOnce({
+				choices: [{ message: { content: "response" } }],
+			})
+			await handler.completePrompt("test prompt", { timeoutMs: 0 })
+			expect(mockCreate).toHaveBeenCalledWith(
+				expect.objectContaining({ model: expect.any(String) }),
+				expect.objectContaining({ timeout: 0 }),
+			)
+		})
+
 		it("should merge signal and timeoutMs together", async () => {
 			const controller = new AbortController()
 			mockCreate.mockResolvedValueOnce({

src/api/providers/__tests__/poe.spec.ts

@@ -392,12 +392,16 @@ describe("PoeHandler", () => {
 			const controller = new AbortController()
 			mockGenerateText.mockResolvedValueOnce({ text: "response" })
 
-			await handler.completePrompt("test prompt", { abortSignal: controller.signal, timeoutMs: 5000 })
-			// The merged abortSignal should be the same as user signal when only signal is provided
+			const promise = handler.completePrompt("test prompt", { abortSignal: controller.signal, timeoutMs: 5000 })
 			const callArgs = mockGenerateText.mock.calls[0][0]
 			expect(callArgs.abortSignal).toBeDefined()
-			// User didn't abort, so signal should not be aborted yet
-			expect(controller.signal.aborted).toBe(false)
+
+			// Abort the user signal before resolve
+			controller.abort()
+
+			await promise
+			// Merged signal should be aborted when user signal aborts
+			expect(callArgs.abortSignal.aborted).toBe(true)
 		})
 
 		it("completePrompt should handle timeoutMs=0 as no timeout", async () => {

src/api/providers/lm-studio.ts

@@ -204,7 +204,7 @@ export class LmStudioHandler extends BaseProvider implements SingleCompletionHan
 			if (options?.abortSignal) {
 				createOptions.signal = options.abortSignal
 			}
-			if (options?.timeoutMs) {
+			if (options?.timeoutMs !== undefined) {
 				createOptions.timeout = options.timeoutMs
 			}
 

src/api/providers/opencode-go.ts

@@ -495,7 +495,7 @@ export class OpencodeGoHandler extends RouterProvider implements SingleCompletio
 				if (options?.abortSignal) {
 					requestOptions.signal = options.abortSignal
 				}
-				if (options?.timeoutMs) {
+				if (options?.timeoutMs !== undefined) {
 					requestOptions.timeout = options.timeoutMs
 				}
 
@@ -551,7 +551,7 @@ export class OpencodeGoHandler extends RouterProvider implements SingleCompletio
 			if (options?.abortSignal) {
 				createOptions.signal = options.abortSignal
 			}
-			if (options?.timeoutMs) {
+			if (options?.timeoutMs !== undefined) {
 				createOptions.timeout = options.timeoutMs
 			}
 

src/api/providers/poe.ts

@@ -136,6 +136,7 @@ export class PoeHandler extends BaseProvider implements SingleCompletionHandler
 
 	async completePrompt(prompt: string, options?: import("../index").CompletePromptOptions): Promise<string> {
 		const { id } = this.getModel()
+		let timeoutId: ReturnType<typeof setTimeout> | undefined
 		try {
 			const generateOptions: Parameters<typeof generateText>[0] & { abortSignal?: AbortSignal } = {
 				model: this.poe(id),
@@ -145,17 +146,12 @@ export class PoeHandler extends BaseProvider implements SingleCompletionHandler
 			// Merge abortSignal and timeoutMs into a single abortSignal
 			if (options?.abortSignal && options?.timeoutMs && options.timeoutMs > 0) {
 				const controller = new AbortController()
-				const timeoutId = setTimeout(() => controller.abort(), options.timeoutMs)
-
-				options.abortSignal.addEventListener(
-					"abort",
-					() => {
-						clearTimeout(timeoutId)
-						controller.abort()
-					},
-					{ once: true },
-				)
-
+				if (options.abortSignal.aborted) {
+					controller.abort()
+				} else {
+					timeoutId = setTimeout(() => controller.abort(), options.timeoutMs)
+					options.abortSignal.addEventListener("abort", () => controller.abort(), { once: true })
+				}
 				generateOptions.abortSignal = controller.signal
 			} else if (options?.abortSignal) {
 				generateOptions.abortSignal = options.abortSignal
@@ -169,6 +165,10 @@ export class PoeHandler extends BaseProvider implements SingleCompletionHandler
 			const errorMessage = error instanceof Error ? error.message : String(error)
 			TelemetryService.instance.captureException(new ApiProviderError(errorMessage, "poe", id, "completePrompt"))
 			throw new Error(`Poe completion error: ${errorMessage}`)
+		} finally {
+			if (timeoutId) {
+				clearTimeout(timeoutId)
+			}
 		}
 	}
 }

src/api/providers/qwen-code.ts

@@ -344,7 +344,7 @@ export class QwenCodeHandler extends BaseProvider implements SingleCompletionHan
 			fetchOptions.signal = options.abortSignal
 		}
 
-		if (options?.timeoutMs) {
+		if (options?.timeoutMs !== undefined) {
 			fetchOptions.timeout = options.timeoutMs
 		}