diff --git a/packages/ai/scripts/generate-models.ts b/packages/ai/scripts/generate-models.ts
index c7a5c3b6..dff5e1e7 100644
--- a/packages/ai/scripts/generate-models.ts
+++ b/packages/ai/scripts/generate-models.ts
@@ -642,17 +642,19 @@ async function generateModels() {
 		opus45.cost.cacheWrite = 6.25;
 	}
 
-	// Temporary Bedrock overrides until https://github.com/anomalyco/models.dev/pull/816 is merged.
-	// 1. Fix incorrect Opus 4.6 Bedrock metadata
+	// Temporary Opus 4.6 overrides until upstream model metadata is corrected.
 	for (const candidate of allModels) {
 		if (candidate.provider === "amazon-bedrock" && candidate.id.includes("anthropic.claude-opus-4-6-v1")) {
 			candidate.cost.cacheRead = 0.5;
 			candidate.cost.cacheWrite = 6.25;
 			candidate.contextWindow = 200000;
 		}
+		if ((candidate.provider === "anthropic" || candidate.provider === "opencode") && candidate.id === "claude-opus-4-6") {
+			candidate.contextWindow = 200000;
+		}
 	}
 
-	// 2. Add missing EU Opus 4.6 profile
+	// Add missing EU Opus 4.6 profile
 	if (!allModels.some((m) => m.provider === "amazon-bedrock" && m.id === "eu.anthropic.claude-opus-4-6-v1")) {
 		allModels.push({
 			id: "eu.anthropic.claude-opus-4-6-v1",
diff --git a/packages/ai/src/models.generated.ts b/packages/ai/src/models.generated.ts
index cb82bf7f..76576b9c 100644
--- a/packages/ai/src/models.generated.ts
+++ b/packages/ai/src/models.generated.ts
@@ -1534,7 +1534,7 @@ export const MODELS = {
 				cacheRead: 0.5,
 				cacheWrite: 6.25,
 			},
-			contextWindow: 1000000,
+			contextWindow: 200000,
 			maxTokens: 128000,
 		} satisfies Model<"anthropic-messages">,
 		"claude-sonnet-4-0": {
@@ -5214,7 +5214,7 @@ export const MODELS = {
 				cacheRead: 0.5,
 				cacheWrite: 6.25,
 			},
-			contextWindow: 1000000,
+			contextWindow: 200000,
 			maxTokens: 128000,
 		} satisfies Model<"anthropic-messages">,
 		"claude-sonnet-4": {