test(api): fix abort signal propagation test timing

Author: easonliang28

src/api/providers/__tests__/openai-codex-native-tool-calls.spec.ts

@@ -546,23 +546,12 @@ describe("OpenAiCodexHandler native tool calls", () => {
 		global.fetch = mockFetch as any
 
 		const controller = new AbortController()
-		await handler.completePrompt("Test prompt", { abortSignal: controller.signal })
+		const promise = handler.completePrompt("Test prompt", { abortSignal: controller.signal })
+		controller.abort()
+		await promise
 
 		const fetchCallArgs = mockFetch.mock.calls[0]
-		// The implementation merges signals using AbortSignal.any(),
-		// which creates a new merged signal when both primary and secondary are provided.
-		// The merged signal should abort when the user's signal aborts.
-		let signalAborted = false
-		fetchCallArgs[1]?.signal.addEventListener(
-			"abort",
-			() => {
-				signalAborted = true
-			},
-			{ once: true },
-		)
-		controller.abort()
-		await new Promise((resolve) => setTimeout(resolve, 10))
-		expect(signalAborted).toBe(true)
+		expect(fetchCallArgs[1]?.signal.aborted).toBe(true)
 	})
 
 	it("completePrompt should work without options (backward compatible)", async () => {

src/api/providers/bedrock.ts

@@ -841,21 +841,19 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 
 			// Build request options with abortSignal and/or timeoutMs
 			let mergeTimeoutId: ReturnType<typeof setTimeout> | undefined
+			let upstreamAbortListener: (() => void) | undefined
 			const sendOptions: { abortSignal?: AbortSignal } | undefined = (() => {
 				let signal: AbortSignal | undefined = options?.abortSignal
 				if (options?.timeoutMs !== undefined && options.timeoutMs > 0) {
 					if (signal && !signal.aborted) {
 						// When both are provided, create a merged signal that aborts when either fires
 						const controller = new AbortController()
 						mergeTimeoutId = setTimeout(() => controller.abort(), options.timeoutMs)
-						signal.addEventListener(
-							"abort",
-							() => {
-								clearTimeout(mergeTimeoutId)
-								controller.abort()
-							},
-							{ once: true },
-						)
+						upstreamAbortListener = () => {
+							clearTimeout(mergeTimeoutId)
+							controller.abort()
+						}
+						signal.addEventListener("abort", upstreamAbortListener, { once: true })
 						signal = controller.signal
 					} else if (!signal) {
 						signal = AbortSignal.timeout(options.timeoutMs)
@@ -870,6 +868,9 @@ export class AwsBedrockHandler extends BaseProvider implements SingleCompletionH
 				response = await this.client.send(command, sendOptions)
 			} finally {
 				if (mergeTimeoutId) clearTimeout(mergeTimeoutId)
+				if (upstreamAbortListener && options?.abortSignal) {
+					options.abortSignal.removeEventListener("abort", upstreamAbortListener)
+				}
 			}
 			if (
 				response?.output?.message?.content &&

src/api/providers/openai-codex.ts

@@ -1158,6 +1158,8 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 		// Build a request-local abort controller with timeout support (don't mutate this.abortController)
 		let localAbortController: AbortController | undefined
 		let timeoutId: ReturnType<typeof setTimeout> | undefined
+		let upstreamAbortSignal: AbortSignal | undefined
+		let upstreamAbortListener: (() => void) | undefined
 
 		if (options?.timeoutMs !== undefined || options?.abortSignal) {
 			localAbortController = new AbortController()
@@ -1174,18 +1176,16 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 
 			// Propagate abort from the caller-supplied signal into the local controller.
 			if (options.abortSignal) {
+				upstreamAbortSignal = options.abortSignal
 				if (options.abortSignal.aborted) {
 					localAbortController.abort()
 					clearTimeout(timeoutId)
 				} else {
-					options.abortSignal.addEventListener(
-						"abort",
-						() => {
-							localAbortController?.abort()
-							clearTimeout(timeoutId)
-						},
-						{ once: true },
-					)
+					upstreamAbortListener = () => {
+						localAbortController?.abort()
+						clearTimeout(timeoutId)
+					}
+					options.abortSignal.addEventListener("abort", upstreamAbortListener, { once: true })
 				}
 			}
 		}
@@ -1292,6 +1292,10 @@ export class OpenAiCodexHandler extends BaseProvider implements SingleCompletion
 			}
 			throw error
 		} finally {
+			clearTimeout(timeoutId)
+			if (upstreamAbortSignal && upstreamAbortListener) {
+				upstreamAbortSignal.removeEventListener("abort", upstreamAbortListener)
+			}
 			this.abortController = undefined
 		}
 	}