@@ -41,7 +41,13 @@ import {
 	convertOpenAIToolsToAnthropic,
 	convertOpenAIToolChoiceToAnthropic,
 } from "../../core/prompts/tools/native-tools/converters"
-import { createAbortError, isRequestAborted, resolveModelWithAbort } from "./utils/abort-signal"
+import {
+	createAbortError,
+	hasUsableTimeout,
+	isRequestAborted,
+	resolveModelWithAbort,
+	toSdkTimeoutMs,
+} from "./utils/abort-signal"
 
 /**
  * The wire formats exposed by the Opencode Go gateway:
@@ -856,16 +862,20 @@ export class OpencodeGoHandler extends RouterProvider implements SingleCompletio
 			reasoningEffort,
 			maxTokens,
 		} = await resolveModelWithAbort(() => this.resolveModel(), options?.abortSignal, "Opencode Go")
+		const timeoutMs = options?.timeoutMs
 
 		if (format === "anthropic") {
 			try {
 				// Build request options with abortSignal and/or timeout handling.
-				// timeoutMs <= 0 means "no explicit timeout": omit the SDK timeout
-				// option entirely — the SDKs treat timeout: 0 as an immediate
-				// abort, which would cancel the request right away.
+				// hasUsableTimeout/toSdkTimeoutMs own the non-positive and non-finite
+				// semantics: the SDKs treat timeout: 0 as an immediate abort and
+				// throw on negative/non-finite values, so only a usable budget is
+				// forwarded.
 				const requestOptions: Anthropic.RequestOptions = {
 					...(options?.abortSignal && { signal: options.abortSignal }),
-					...(options?.timeoutMs !== undefined && options.timeoutMs > 0 && { timeout: options.timeoutMs }),
+				}
+				if (hasUsableTimeout(timeoutMs)) {
+					requestOptions.timeout = toSdkTimeoutMs(timeoutMs)
 				}
 
 				const message = await this.anthropicClient.messages.create(
@@ -911,12 +921,14 @@ export class OpencodeGoHandler extends RouterProvider implements SingleCompletio
 		if (format === "responses") {
 			try {
 				// Build request options with abortSignal and/or timeout (series
-				// standard): timeoutMs <= 0 means "no explicit timeout" — the
-				// OpenAI SDK treats timeout: 0 as an immediate abort, so the SDK
-				// timeout option is omitted unless the value is positive.
+				// standard): hasUsableTimeout/toSdkTimeoutMs own the disabled and
+				// non-finite semantics, so the SDK option is only set for a usable
+				// budget.
 				const createOptions: OpenAI.RequestOptions = {
 					...(options?.abortSignal && { signal: options.abortSignal }),
-					...(options?.timeoutMs !== undefined && options.timeoutMs > 0 && { timeout: options.timeoutMs }),
+				}
+				if (hasUsableTimeout(timeoutMs)) {
+					createOptions.timeout = toSdkTimeoutMs(timeoutMs)
 				}
 
 				const response = await this.client.responses.create(
@@ -987,13 +999,14 @@ export class OpencodeGoHandler extends RouterProvider implements SingleCompletio
 					reasoningEffort as OpenAI.Chat.ChatCompletionCreateParams["reasoning_effort"]
 			}
 
-			// Build request options with abortSignal and/or timeout for OpenAI path.
-			// timeoutMs <= 0 means "no explicit timeout": omit the SDK timeout
-			// option entirely — the OpenAI SDK treats timeout: 0 as an immediate
-			// abort, which would cancel the request right away.
+			// Build request options with abortSignal and/or timeout for the OpenAI
+			// path: hasUsableTimeout/toSdkTimeoutMs own the disabled and non-finite
+			// semantics.
 			const createOptions: OpenAI.RequestOptions = {
 				...(options?.abortSignal && { signal: options.abortSignal }),
-				...(options?.timeoutMs !== undefined && options.timeoutMs > 0 && { timeout: options.timeoutMs }),
+			}
+			if (hasUsableTimeout(timeoutMs)) {
+				createOptions.timeout = toSdkTimeoutMs(timeoutMs)
 			}
 
 			const response = await this.client.chat.completions.create(requestOptions, {