Skip to content

feat(codex): default to gpt-6.1 sol with gpt-6 sol fallback - #607

Merged
astyfx merged 3 commits into
mainfrom
fix/sol61
Sep 30, 2026
Merged

astyfx merged 3 commits into
mainfrom
fix/sol61

Conversation

@astyfx

@astyfx astyfx commented Sep 30, 2026

Copy link
Copy Markdown
Member

Summary

Make GPT-6.1 Sol the Codex default and flagship model, with an automatic one-time fallback to GPT-6 Sol when the installed runtime does not offer it.

Changes

Features

  • codex: GPT-6.1 Sol (gpt-6.1-sol) is the default Codex model, with the same high default effort and pricing band as GPT-6 Sol.
  • codex: when the runtime reports GPT-6.1 Sol as unavailable, the thread is retried once on GPT-6 Sol and the substitution is recorded.
  • settings: a one-time migration moves a selected GPT-6 Sol (settings, shortcuts, task presets) to GPT-6.1 Sol and leaves the stored effort unchanged.

Fixes

  • codex: none.

Refactors / Chores

  • codex: thread start/resume moves from codex-app-server-runtime.ts into codex-ensure-thread.ts.
  • docs: provider runtime, entrypoint, and code-organization docs describe the new default, fallback, and owner.

Breaking Changes

  • None. GPT-6 Sol stays resolvable for history and explicit selections.

Test Evidence

  • bun run typecheck: pass.
  • Focused suites (codex-ensure-thread, model-catalog, provider-model-catalog-merge, settings-model-migration, codex-model-resolution, worker-mode, auto-routing-profile, model-selector-utils, codex-app-server-runtime): pass.
  • Every tests/codex-*, *provider*, and task-presets* file passes when run individually.

Notes

  • GPT-6.1 Sol was present in the Codex CLI 0.159.1 bundled catalog, which reports a low default reasoning level. Stave deliberately keeps high so a model change does not change the stored effort.
  • No minimum client version is assigned to GPT-6.1 Sol.
  • Risk/rollback: revert this PR; the migration only rewrites the model id, so reverting leaves a stored gpt-6.1-sol unresolved by older builds. It falls back to catalog defaults.

Make GPT-6.1 Sol the Codex default and flagship. Keep GPT-6 Sol resolvable
for history and retry a thread once on it when the installed runtime reports
GPT-6.1 Sol as unavailable. Thread start/resume moves into
codex-ensure-thread.ts, and a settings migration moves a selected GPT-6 Sol
to GPT-6.1 Sol without changing the stored effort.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
@astyfx
astyfx requested a review from a team as a code owner September 30, 2026 04:34
@astyfx
astyfx requested review from dodonmountain and png-1105 and removed request for a team September 30, 2026 04:34
@upwind-code-us

upwind-code-us Bot commented Sep 30, 2026 •

Copy link
Copy Markdown

Upwind Upwind Code Scan - ⚠️ Warn

8 newly introduced vulnerabilities · 0 resolved · 50 total in this PR vs main

Total breakdown: 🔶 13 High | 🟡 34 Medium | 🟢 3 Low


🔶 High · 8 findings
CVE Package Version Fix
CVE-2026-6321 fast-uri 3.1.0 3.1.1
CVE-2026-76172 fast-uri 3.1.0 3.1.6
CVE-2026-75975 fast-uri 3.1.0 3.1.6
CVE-2026-6322 fast-uri 3.1.0 3.1.2
CVE-2026-13676 fast-uri 3.1.0 3.1.3
CVE-2026-84292 fast-uri 3.1.0 3.1.7
CVE-2026-16221 fast-uri 3.1.0 3.1.4
CVE-2026-18446 fast-uri 3.1.0 3.1.5

View full analysis in Upwind Console

Scan completed in 16s

Scan history (3 scans)
Commit Scanned at New Resolved Net
b393a1b 2026-09-30 04:35 UTC 0 0 0
03b2d5c 2026-09-30 04:40 UTC 0 0 0
a6fad7b < 2026-09-30 04:45 UTC +8 0 +8

Last scanned: a6fad7b · 2026-09-30 04:45 UTC

@upwind-code-us

upwind-code-us Bot commented Sep 30, 2026 •

Copy link
Copy Markdown

Upwind Upwind IaC Scan - ✅ Passed

0 newly introduced misconfigurations · 0 resolved · 0 total in this PR vs main

View full analysis in Upwind Console →

Scan completed in 3s

Scan history (4 scans)
Commit Scanned at New Resolved Net
b393a1b 2026-09-30 04:34 UTC 0 0 0
b393a1b 2026-09-30 04:34 UTC — — —
03b2d5c 2026-09-30 04:40 UTC 0 0 0
a6fad7b < 2026-09-30 04:45 UTC 0 0 0

Last scanned: a6fad7b · 2026-09-30 04:45 UTC

@astyfx
astyfx enabled auto-merge (squash) September 30, 2026 04:34
astyfx and others added 2 commits September 30, 2026 13:39
Give ensureCodexThread an explicit return type so the one-shot fallback
retry no longer trips implicit-any diagnostics (TS7022/TS7023) in the
main-process typecheck.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
…ests

Tests that assert the Codex default or an available flagship model still
named GPT-6 Sol, which is no longer in the picker catalog. Point them at
GPT-6.1 Sol.

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>

@heath-s heath-s left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved

@astyfx
astyfx merged commit 6b71d31 into main Sep 30, 2026
6 checks passed
@astyfx
astyfx deleted the fix/sol61 branch September 30, 2026 04:50
@astyfx astyfx mentioned this pull request Sep 30, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants