diff --git a/src/shared/provider-model-id-transform.ts b/src/shared/provider-model-id-transform.ts
index 2d5fd656d..a4869c3c9 100644
--- a/src/shared/provider-model-id-transform.ts
+++ b/src/shared/provider-model-id-transform.ts
@@ -9,13 +9,17 @@ function inferSubProvider(model: string): string | undefined {
 	return undefined
 }
 
-function transformModelForGateway(model: string): string {
-	return model
-		.replace("claude-opus-4-6", "claude-opus-4.6")
-		.replace("claude-sonnet-4-6", "claude-sonnet-4.6")
-		.replace("claude-sonnet-4-5", "claude-sonnet-4.5")
-		.replace("claude-haiku-4-5", "claude-haiku-4.5")
-		.replace(/gemini-3\.1-pro(?!-)/g, "gemini-3.1-pro-preview")
+const CLAUDE_VERSION_DOT = /claude-(\w+)-(\d+)-(\d+)/g
+const GEMINI_31_PRO_PREVIEW = /gemini-3\.1-pro(?!-)/g
+const GEMINI_3_FLASH_PREVIEW = /gemini-3-flash(?!-)/g
+
+function claudeVersionDot(model: string): string {
+	return model.replace(CLAUDE_VERSION_DOT, "claude-$1-$2.$3")
+}
+
+function applyGatewayTransforms(model: string): string {
+	return claudeVersionDot(model)
+		.replace(GEMINI_31_PRO_PREVIEW, "gemini-3.1-pro-preview")
 }
 
 export function transformModelForProvider(provider: string, model: string): string {
@@ -24,34 +28,26 @@ export function transformModelForProvider(provider: string, model: string): stri
 		if (slashIndex !== -1) {
 			const subProvider = model.substring(0, slashIndex)
 			const subModel = model.substring(slashIndex + 1)
-			return `${subProvider}/${transformModelForGateway(subModel)}`
+			return `${subProvider}/${applyGatewayTransforms(subModel)}`
 		}
 		const subProvider = inferSubProvider(model)
 		if (subProvider) {
-			return `${subProvider}/${transformModelForGateway(model)}`
+			return `${subProvider}/${applyGatewayTransforms(model)}`
 		}
 		return model
 	}
 	if (provider === "github-copilot") {
-		return model
-			.replace("claude-opus-4-6", "claude-opus-4.6")
-			.replace("claude-sonnet-4-6", "claude-sonnet-4.6")
-			.replace("claude-sonnet-4-5", "claude-sonnet-4.5")
-			.replace("claude-haiku-4-5", "claude-haiku-4.5")
-			.replace("claude-sonnet-4", "claude-sonnet-4")
-			.replace(/gemini-3\.1-pro(?!-)/g, "gemini-3.1-pro-preview")
-			.replace(/gemini-3-flash(?!-)/g, "gemini-3-flash-preview")
+		return claudeVersionDot(model)
+			.replace(GEMINI_31_PRO_PREVIEW, "gemini-3.1-pro-preview")
+			.replace(GEMINI_3_FLASH_PREVIEW, "gemini-3-flash-preview")
 	}
 	if (provider === "google") {
 		return model
-			.replace(/gemini-3\.1-pro(?!-)/g, "gemini-3.1-pro-preview")
-			.replace(/gemini-3-flash(?!-)/g, "gemini-3-flash-preview")
+			.replace(GEMINI_31_PRO_PREVIEW, "gemini-3.1-pro-preview")
+			.replace(GEMINI_3_FLASH_PREVIEW, "gemini-3-flash-preview")
 	}
 	if (provider === "anthropic") {
-		return model
-			.replace("claude-opus-4-6", "claude-opus-4.6")
-			.replace("claude-sonnet-4-6", "claude-sonnet-4.6")
-			.replace("claude-haiku-4-5", "claude-haiku-4.5")
+		return claudeVersionDot(model)
 	}
 	return model
 }