@@ -276,9 +276,10 @@ export function nativeOpenAiContextWindow(slug: string, limits?: NativeContextLi
  * pick a window per request (Cursor's local-agent "Context" selector). The pair is the family's
  * pinned default window and its opt-in ceiling, independent of whether the operator has
  * already opted the proxy into the long window: the selector exists so the client can choose.
- * A provider cap below the long tier removes the tier; a cap at or above it leaves it intact
- * (the 922k/1050k opt-in values are the levers, not a request to shrink). Undefined when the
- * family has no separate tier or when the two windows coincide.
+ * Any user lever below the long window removes the tier: a per-model window override, the
+ * provider-level window override, or a provider context cap. A lever at or above it leaves the
+ * tier intact (the 922k/1050k opt-in values are the levers, not a request to shrink). Undefined
+ * when the family has no separate tier or when the two windows coincide.
  */
 export function nativeOpenAiContextTier(
   slug: string,
@@ -288,8 +289,13 @@ export function nativeOpenAiContextTier(
   const defaultWindow = positiveInt(override?.contextWindow);
   const longWindow = positiveInt(override?.maxContextWindow);
   if (defaultWindow === undefined || longWindow === undefined || longWindow <= defaultWindow) return undefined;
-  const cap = positiveInt(asLimits(limits).cap);
-  if (cap !== undefined && cap < longWindow) return undefined;
+  const resolved = asLimits(limits);
+  const levers = [
+    positiveInt(resolved.modelWindows?.[slug]),
+    positiveInt(resolved.providerWindow),
+    positiveInt(resolved.cap),
+  ];
+  if (levers.some(lever => lever !== undefined && lever < longWindow)) return undefined;
   return { defaultWindow, longWindow };
 }
 
 
@@ -3,7 +3,7 @@ import { mkdtempSync, rmSync } from "node:fs";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
 import { saveConfig } from "../src/config";
-import { nativeReasoningEfforts } from "../src/codex/catalog";
+import { nativeOpenAiContextTier, nativeReasoningEfforts } from "../src/codex/catalog";
 import {
   resetCodexModelEntitlementCacheForTests,
   seedCodexModelEntitlementsForTests,
@@ -110,6 +110,22 @@ describe("modelCapabilityFields", () => {
   });
 });
 
+describe("nativeOpenAiContextTier", () => {
+  test("native GPT-5.6 carries the 272k/922k pair and other natives carry none", () => {
+    expect(nativeOpenAiContextTier("gpt-5.6-sol")).toEqual({ defaultWindow: 272000, longWindow: 922000 });
+    expect(nativeOpenAiContextTier("gpt-5.5")).toBeUndefined();
+  });
+
+  test("any user lever below the long window removes the tier; levers at or above it keep it", () => {
+    expect(nativeOpenAiContextTier("gpt-5.6-sol", { cap: 500000 })).toBeUndefined();
+    expect(nativeOpenAiContextTier("gpt-5.6-sol", { providerWindow: 400000 })).toBeUndefined();
+    expect(nativeOpenAiContextTier("gpt-5.6-sol", { modelWindows: { "gpt-5.6-sol": 300000 } })).toBeUndefined();
+    expect(nativeOpenAiContextTier("gpt-5.6-sol", { cap: 1050000, providerWindow: 922000 })).toEqual({ defaultWindow: 272000, longWindow: 922000 });
+    // A window override for another slug does not touch this one.
+    expect(nativeOpenAiContextTier("gpt-5.6-sol", { modelWindows: { "gpt-5.6-terra": 300000 } })).toEqual({ defaultWindow: 272000, longWindow: 922000 });
+  });
+});
+
 describe("raw /v1/models list advertises Cursor local-agent capabilities", () => {
   test("routed rows carry api_types and capabilities derived from provider config", async () => {
     seedCodexModelEntitlementsForTests("main", ["gpt-5.6-sol"]);