[WRONG BRANCH] Merge dev into main: Windows suite green

devlog/_plan/260817_native_gpt56_1m_context/070_default_272k_opt_in.md

@@ -0,0 +1,25 @@
+# 070 — Native GPT-5.6 default follows Codex 272k
+
+## Change
+
+- `NATIVE_GPT56_CONTEXT_WINDOW` is 272,000 (Codex live advertised default).
+- Measured ceiling / 1M opt-in stays `NATIVE_GPT56_MAX_INPUT_TOKENS` = 922,000.
+- For the GPT-5.6 family only, `providerContextCaps.openai` and per-model overlays may RAISE the default up to 922k. Values above 922k clamp. Other native slugs still only lower.
+- Native group switch ON without a value sends 922,000. Switch OFF displays 272k.
+- API-key 1,050,000 / 922,000 path is unchanged. gpt-5.4 stays 1M. gpt-5.5 stays 272k.
+
+## Files
+
+- `src/codex/catalog/metadata.ts`
+- `gui/src/pages/Models.tsx`
+- `gui/src/pages/models-shared.ts`
+- `structure/08_openai-provider-tiers.md`
+- focused tests listed in the same commit
+
+## Accept
+
+- `nativeOpenAiContextWindow("gpt-5.6-sol") === 272000`
+- `nativeOpenAiContextWindow("gpt-5.6-sol", 922000) === 922000`
+- `nativeOpenAiContextWindow("gpt-5.6-sol", 2000000) === 922000`
+- `nativeOpenAiContextWindow("gpt-5.5", 922000) === 272000`
+- Claude default sol is unmarked; opted-in 922k marks `[1m]`

gui/src/pages/Models.tsx

@@ -51,6 +51,8 @@ import {
   fmtK,
   NATIVE_CAP_OPTIONS,
   NATIVE_CAP_OPTION_SET,
+  NATIVE_GPT56_DEFAULT_WINDOW,
+  NATIVE_GPT56_OPT_IN_WINDOW,
   PAGE,
   readCollapsedProviders,
   THREAD_OPTION_SET,
@@ -629,7 +631,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string;
     }
   };
 
-  const toggleProviderCap = async (provider: string) => {
+  const toggleProviderCap = async (provider: string, nativeGroup = false) => {
     setBusy(true);
     busyRef.current = true;
     setStatus("");
@@ -640,7 +642,9 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string;
       const r = await fetch(`${apiBase}/api/provider-context-caps`, {
         method: "PUT",
         headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ provider, enabled }),
+        body: JSON.stringify(enabled && nativeGroup
+          ? { provider, enabled, value: NATIVE_GPT56_OPT_IN_WINDOW }
+          : { provider, enabled }),
       });
       try {
         const data = await readJsonOrThrow<ProviderContextCapsResponse>(r, t("models.capSaveFailed"));
@@ -1025,7 +1029,9 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string;
       if (window === undefined) return widest;
       return widest === undefined || window > widest ? window : widest;
     }, undefined);
-    const capDisplayValue = capOn ? providerCap : (widestRowWindow ?? providerCap);
+    const capDisplayValue = capOn
+      ? providerCap
+      : (nativeProviderGroup ? NATIVE_GPT56_DEFAULT_WINDOW : (widestRowWindow ?? providerCap));
     // The native group offers only the three windows GPT-5.6 actually has contracts for
     // (272k live, 372k legacy, 1.05M measured); routed providers keep the generic ladder.
     // The set has to follow the list, or a saved value outside it loses its option.
@@ -1118,7 +1124,7 @@ export default function Models({ apiBase, restartEpoch = 0 }: { apiBase: string;
              <button type="button" className="btn btn-ghost btn-sm text-caption" disabled={busy || allOn} onClick={() => bulkToggle(true)}>{t("models.allOn")}</button>
              <button type="button" className="btn btn-ghost btn-sm text-caption" disabled={busy || allOff} onClick={() => bulkToggle(false)}>{t("models.allOff")}</button>
              <>
-               <Switch on={capOn} onClick={() => toggleProviderCap(provider)} disabled={busy} label={t("models.capValue", { value: fmtK(capDisplayValue) })} />
+               <Switch on={capOn} onClick={() => toggleProviderCap(provider, nativeProviderGroup)} disabled={busy} label={t("models.capValue", { value: fmtK(capDisplayValue) })} />
                {/* The native group keeps the value visible with the cap off: its rows always
                    advertise SOME window, so hiding the number leaves the card saying nothing
                    about the context Codex will actually see. Routed providers keep the old

gui/src/pages/models-shared.ts

@@ -84,7 +84,9 @@ export const CAP_OPTION_SET = new Set(CAP_OPTIONS);
  * window, so listing a value above the advertised one would be an inert choice.
  * Anything else goes through "Custom".
  */
-export const NATIVE_CAP_OPTIONS = [272_000, 372_000, 922_000];
+export const NATIVE_GPT56_DEFAULT_WINDOW = 272_000;
+export const NATIVE_GPT56_OPT_IN_WINDOW = 922_000;
+export const NATIVE_CAP_OPTIONS = [NATIVE_GPT56_DEFAULT_WINDOW, 372_000, NATIVE_GPT56_OPT_IN_WINDOW];
 export const NATIVE_CAP_OPTION_SET = new Set(NATIVE_CAP_OPTIONS);
 export const CUSTOM_OPTION = "custom";
 export const THREAD_OPTIONS = [4, 8, 16, 32, 64, 128, 256, 500, 1000];

gui/tests/models-native-group-controls.test.ts

@@ -60,7 +60,12 @@ test("the native group keeps its window readable with the cap switched off", asy
   expect(src).toContain("{(capOn || nativeProviderGroup) && (");
   // With the cap off the stored value is only what a future toggle would apply — the 350k
   // default — so the display falls back to the widest window the rows actually advertise.
-  expect(src).toContain("const capDisplayValue = capOn ? providerCap : (widestRowWindow ?? providerCap);");
+  // Matched as separate fragments because the expression is wrapped across lines now, and
+  // it grew a native branch: with the cap off the native group shows its default window
+  // rather than the widest advertised row. A single-line literal pinned the formatting
+  // instead of the behaviour and broke on the reflow that introduced that branch.
+  expect(src).toContain("const capDisplayValue = capOn");
+  expect(src).toContain("nativeProviderGroup ? NATIVE_GPT56_DEFAULT_WINDOW : (widestRowWindow ?? providerCap)");
   // The select is inert until the cap is actually on: showing a number is not the same as
   // offering to change one.
   expect(src).toContain("disabled={busy || !capOn}");

scripts/test.ts

@@ -37,6 +37,17 @@ export function createIsolatedTestEnvironment(
       // real-home write guard can still know which path to protect.
       // (devlog 260730_codex_rs_upstream_v2_live_handoff/070.)
       OCX_REAL_HOME: baseEnv.OCX_REAL_HOME ?? homedir(),
+      // Pin git's global config to the developer's real one before HOME moves.
+      //
+      // git resolves ~/.gitconfig from HOME, so a sandboxed HOME makes it invisible.
+      // That silently drops `safe.directory`, and on a checkout whose directory owner
+      // differs from the running account -- ordinary on Windows when a tool or
+      // installer created the tree -- every `git` call a test makes then fails with
+      // "detected dubious ownership". The test reads that as "this is not a git
+      // repository" and asserts against a fallback, which looks like a product bug in
+      // whichever adapter collected the metadata. Naming the file keeps the sandbox
+      // (git still writes nothing here) while leaving git's own trust decisions intact.
+      GIT_CONFIG_GLOBAL: baseEnv.GIT_CONFIG_GLOBAL ?? join(homedir(), ".gitconfig"),
       HOME: root,
       USERPROFILE: root,
       OPENCODEX_HOME: opencodexHome,

src/claude/context-windows.ts

@@ -10,7 +10,7 @@
  */
 import { aliasForNative, aliasForRoute } from "./alias";
 import { desktop3pAlias } from "./desktop-3p";
-import { nativeOpenAiContextWindow, type CatalogModel } from "../codex/catalog";
+import { nativeOpenAiContextWindow, type CatalogModel, type NativeContextLimitsInput } from "../codex/catalog";
 
 const ONE_MILLION = 1_000_000;
 
@@ -104,7 +104,7 @@ export function buildClaudeContextWindows(
   // A configured providerContextCaps.openai has to reach the native rows here too. Without
   // it the Claude surface keeps advertising the uncapped authoritative window while the
   // Codex catalog advertises the capped one, and the two disagree about the same model.
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): Record<string, number> {
   const out: Record<string, number> = {};
   const put = (key: string | null, value: number) => {

src/claude/desktop-3p.ts

@@ -10,7 +10,7 @@ import {
   renderDesktopProfile,
   type DesktopProfileModel,
 } from "./desktop-profile";
-import { nativeOpenAiContextWindow } from "../codex/catalog";
+import { nativeOpenAiContextWindow, type NativeContextLimitsInput } from "../codex/catalog";
 import { assertDesktop3pModelsValid } from "./desktop-3p-guard";
 
 export interface Desktop3pModelEntry {
@@ -191,7 +191,7 @@ function collectDesktop3pModels(
   nativeSlugs: string[],
   routedModels: Array<Desktop3pRoutedModel>,
   profile?: OcxClaudeDesktopProfile,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): { models: Desktop3pModelEntry[]; registry: Map<string, string> } {
   const registry = new Map<string, string>();
   const models: Desktop3pModelEntry[] = [];
@@ -293,7 +293,7 @@ export function buildDesktop3pRegistry(
   nativeSlugs: string[],
   routedModels: Array<Desktop3pRoutedModel>,
   profile?: OcxClaudeDesktopProfile,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): Map<string, string> {
   const { registry } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
   desktop3pRegistry = registry;
@@ -305,7 +305,7 @@ export function generateDesktop3pModels(
   nativeSlugs: string[],
   routedModels: Array<Desktop3pRoutedModel>,
   profile?: OcxClaudeDesktopProfile,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): Desktop3pModelEntry[] {
   const { models, registry } = collectDesktop3pModels(nativeSlugs, routedModels, profile, nativeContextCap);
   desktop3pRegistry = registry;
@@ -337,7 +337,7 @@ export function generateDesktop3pConfig(
   apiKey = "ocx",
   mode: Desktop3pConfigMode = "static",
   profile?: OcxClaudeDesktopProfile,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): object {
   const base = {
     inferenceProvider: "gateway",
@@ -558,7 +558,7 @@ export function writeDesktop3pConfig(
   apiKey?: string,
   mode: Desktop3pConfigMode = "static",
   profile?: OcxClaudeDesktopProfile,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): { written: boolean; path: string; reason?: string; fingerprint?: string } {
   const libraryPath = resolveDesktop3pConfigLibraryPath();
   const metadataPath = join(libraryPath, "_meta.json");

src/claude/model-info.ts

@@ -15,7 +15,7 @@
  *  - created_at is a fixed constant; max_input_tokens is authoritative-or-null;
  *    max_tokens is always null (no authoritative output limit exists proxy-side).
  */
-import { catalogModelEfforts, nativeEffortClamp, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, type CatalogModel } from "../codex/catalog";
+import { catalogModelEfforts, nativeEffortClamp, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, type CatalogModel, type NativeContextLimitsInput } from "../codex/catalog";
 import { claudeCodeAlias, claudeCodeNativeAlias } from "./alias";
 import { desktop3pAlias } from "./desktop-3p";
 import { AUTO_CONTEXT_OFF, type AutoContextMode } from "./context-windows";
@@ -108,7 +108,7 @@ export function buildAnthropicModelInfos(
   auto: AutoContextMode = AUTO_CONTEXT_OFF,
   idStyle: AnthropicIdStyle = "desktop3p",
   aliasForRoute: (provider: string, modelId: string) => string = desktop3pAlias,
-  nativeContextCap?: number,
+  nativeContextCap?: NativeContextLimitsInput,
 ): AnthropicModelInfo[] {
   const out: AnthropicModelInfo[] = [];
   const seen = new Set<string>();

src/cli/claude-desktop.ts

@@ -11,11 +11,10 @@ import {
   type DesktopProfile,
 } from "../claude/desktop-profile";
 import { writeDesktop3pConfig, type Desktop3pConfigMode, parseDesktop3pModeArgs } from "../claude/desktop-3p";
-import { filterCatalogVisibleModels, desktopVisibleNativeSlugs } from "../codex/catalog";
+import { filterCatalogVisibleModels, desktopVisibleNativeSlugs, nativeContextLimits } from "../codex/catalog";
 import { buildClaudeDesktopState, fetchAllModels } from "../server/management-api";
 import { findLiveProxy } from "../server/proxy-liveness";
 import { runtimeRequest } from "./runtime-api";
-import { providerContextCap } from "../providers/context-cap";
 import { OPENAI_CODEX_PROVIDER_ID } from "../providers/openai-tiers";
 
 function isFamily(value: string | undefined): value is DesktopFamily {
@@ -100,7 +99,7 @@ export async function applyProfile(
     config.apiKeys?.[0]?.key,
     mode,
     state.profile,
-    providerContextCap(config, OPENAI_CODEX_PROVIDER_ID),
+    nativeContextLimits(config),
   );
   return { ok: result.written, path: result.path, reason: result.reason };
 }

src/codex/catalog.ts

@@ -2,7 +2,7 @@
 // Public surface preserved exactly; importers keep using "src/codex/catalog".
 export { isMediaGenerationModelId, shouldExposeRoutedModel, readCodexCatalogPath, readCatalog, normalizeRoutedCatalogEntry, catalogModelSlug, filterSupportedNativeSlugs, catalogModelSupportsReasoningSummaries } from "./catalog/parsing";
 export type { CatalogModel, MultiAgentMode } from "./catalog/parsing";
-export { accountBoundNativeOpenAiSlugs, accountBoundNativeOpenAiSlugsBySelector, CODEX_NATIVE_ALIAS_CATALOG_KIND, NATIVE_DAYBREAK_BLUE_MODEL, NATIVE_GPT56_MAX_INPUT_TOKENS, NATIVE_OPENAI_CAPABILITY_ALIAS_MODELS, NATIVE_OPENAI_MODELS, configuredNativeAliasSlugs, desktopAllowlistSuppressedNativeSlugs, isNativeAliasCatalogEntry, isNativeOpenAiCapabilityAliasModel, nativeContextLimits, nativeOpenAiCapabilitySourceSlug, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, disabledNativeSlugs, visibleNativeSlugs, desktopVisibleNativeSlugs, nativeModelRows, applyNativeVisibility, observedAccountBoundNativeEntries, observedAccountBoundNativeOpenAiSlugs, upstreamNativeEntry, nativeOpenAiSlugs, listCatalogNativeSlugs, nativeInputModalities, nativeReasoningEfforts, nativeDefaultReasoningEffort, shouldIncludeAccountBoundNativeOpenAi, shouldIncludeNativeOpenAi, type NativeContextLimits, type NativeContextLimitsInput } from "./catalog/metadata";
+export { accountBoundNativeOpenAiSlugs, accountBoundNativeOpenAiSlugsBySelector, CODEX_NATIVE_ALIAS_CATALOG_KIND, NATIVE_DAYBREAK_BLUE_MODEL, NATIVE_GPT56_CONTEXT_WINDOW, NATIVE_GPT56_MAX_INPUT_TOKENS, NATIVE_GPT56_OPT_IN_CONTEXT_WINDOW, NATIVE_OPENAI_CAPABILITY_ALIAS_MODELS, NATIVE_OPENAI_MODELS, configuredNativeAliasSlugs, desktopAllowlistSuppressedNativeSlugs, isNativeAliasCatalogEntry, isNativeOpenAiCapabilityAliasModel, nativeContextLimits, nativeOpenAiCapabilitySourceSlug, nativeOpenAiContextWindow, nativeOpenAiMaxInputTokens, disabledNativeSlugs, visibleNativeSlugs, desktopVisibleNativeSlugs, nativeModelRows, applyNativeVisibility, observedAccountBoundNativeEntries, observedAccountBoundNativeOpenAiSlugs, upstreamNativeEntry, nativeOpenAiSlugs, listCatalogNativeSlugs, nativeInputModalities, nativeReasoningEfforts, nativeDefaultReasoningEffort, shouldIncludeAccountBoundNativeOpenAi, shouldIncludeNativeOpenAi, type NativeContextLimits, type NativeContextLimitsInput } from "./catalog/metadata";
 export { isSpawnableCodexCandidate, codexExecInvocation, loadBundledCodexCatalog, materializeBundledCodexCatalog, loadCatalogTemplate } from "./catalog/bundled";
 export { nativeEffortClamp, shouldApplyNativeEffortClamp, catalogModelEfforts, codexSupportedReasoningEfforts, clampedDefaultEffort, clampEntryToCodexSupportedEfforts, clampCatalogModelsToCodexSupport } from "./catalog/effort";
 export { applyProviderConfigHints, isDatedVariantId, filterCatalogVisibleModels, gatherRoutedModels, clearGatherRoutedModelsInflight, augmentRoutedModelsWithRegistryOpenAiApiRows, augmentRoutedModelsWithMetadata, resolveComboCatalogMember, configuredComboTargetModelsByProvider } from "./catalog/provider-fetch";