fix(codex): preserve qualified model ids in selection and generation - #9921
Merged
maria-rcks merged 1 commit intoSep 11, 2026
Merged
Conversation
Contributor
ApprovabilityVerdict: Not approved Macroscope's review found this PR not approvable — The PR changes production Codex model selection by resolving qualified wire IDs and can change which model is marked and used as the default. The generation path also now derives its CLI model argument from the live provider snapshot, warranting human review. You can add or adjust custom eligibility rules. Learn more. |
aorwall
added a commit
to aorwall/t3code
that referenced
this pull request
Sep 12, 2026
Merges `upstream/main` at `e81606494` into the fork, from merge base `02297e3db` — 47 upstream commits. The theme of this range is scopable settings: upstream made every server setting addressable at a scope (global / environment / project) with per-project overrides, which is why 11 of the 15 conflicts are settings files. The rest is conversation rewind, floating device streams, and a large batch of message-sync and markdown-streaming perf work. ## Merge stats - Landed (`HEAD^1..HEAD`): 277 files, 17243+/4783− - Upstream range (base..`HEAD^2`): 275 files, 17011+/4749− - Fork delta (`HEAD^2..HEAD`): 756 files, 76559+/2096− The two file lists reconcile: the 3 extra landed files are `docs/fork/inventory.json`, `docs/fork/upstream-merge-log.md` and `docs/fork/gaps.md`; the 1 file in the range that did not land is `apps/web/src/routes/settings.integrations.tsx`, resolved `ours` per the `moatless-admin-integrations-route` inventory entry (that route is a Moatless admin page here, and upstream's embedded-surface settings live at `/settings/browser`). All 15 conflicts were resolved by the verdict `preflight.mjs` printed. No `decide` conflict was left unresolved. Details, including the owned-concern sweep (no keyword hits) and the unsupported-method reconciliation (0 ADD, 0 DROP, 2 KEEP, 4 known exceptions), are in the dated entry in `docs/fork/upstream-merge-log.md`. Two findings worth naming here: - **A silent auto-merge failure.** pingdotgg#11285 changed the mini-player target from a tab id to a source union. Git updated upstream's own assertion in `PreviewView.test.tsx` and left the fork-only "under the frame capability" case next to it still asserting the old string. No conflict marker, no `resolution-check.mjs` finding — only the fork's own test suite caught it. - **Stale inventory anchors.** Upstream moved the project Actions section out of `ProjectSettingsPanel.tsx` into a new `ProjectActionsSettings.tsx`, which is where `scriptsEditable` is now derived and where upstream's new writing Reset button is gated. Four inventory entries were re-pointed in this merge rather than silently dropping their deltas. ## Usable as-is Client work the fork can expose with no Moatless backend change: - Scoped settings UI and the two-select scope picker (pingdotgg#10639, pingdotgg#10636) — `SettingsScopeContext`, `ScopedSwitch`, `settingKeys`, the `mixed` state. The reading half works against Moatless today. - Float device streams over chat, as a source union rather than a tab id (pingdotgg#11285); recording status on floating previews (pingdotgg#11312); floating preview using composer margins (pingdotgg#11290). - PR-page selections into new drafts (pingdotgg#11296); projects-on-another-machine badge (pingdotgg#11323); Usage opening on Limits (pingdotgg#11261). - macOS permission onboarding (pingdotgg#11289); hold-to-quit fix (pingdotgg#11016); preview keystrokes kept out of the composer (pingdotgg#11354). - Message-sync and markdown-streaming perf: pingdotgg#11302, pingdotgg#11029, pingdotgg#11211, pingdotgg#11198, pingdotgg#11196, pingdotgg#11193, pingdotgg#11181, pingdotgg#11206. - Assorted web/mobile fixes: pingdotgg#11361, pingdotgg#10757, pingdotgg#11357, pingdotgg#10571, pingdotgg#11348, pingdotgg#11349, pingdotgg#11281, pingdotgg#11188, pingdotgg#11283, pingdotgg#11292, pingdotgg#11187, pingdotgg#11228, pingdotgg#11103, pingdotgg#10612, pingdotgg#11032, pingdotgg#11233, pingdotgg#11234, pingdotgg#11304, pingdotgg#11240. ## Unsupported in Moatless / needs implementation - **Conversation rewind** — `thread.conversation.revert` (pingdotgg#11358). A new member of `DispatchableClientOrchestrationCommand` in `packages/contracts/src/orchestration.ts`, bringing the fork to 30 command types (28 upstream's, 2 fork-only). Moatless does not dispatch it, and a client command cannot be refused per-type, so "Edit from here" on `RevertUserMessageButton` is reachable whenever the turn is idle and does nothing. Needs backend dispatch. - **Per-project setting overrides** — the `projectSettingsOverrides` capability and the 17-key `ProjectSettingsOverrides` record (pingdotgg#11176). Two pieces are needed: the capability reported by `/.well-known/t3/environment`, and `server.updateSettings` served at project scope. Until both land, the capability filter in `scopedSettings.ts:170` and `ProjectActionsSettings.tsx:72` drops the write on the client — the control renders, the user toggles it, and **the write never leaves the browser**. A silent no-op is worse than a hidden control or an honest refusal; recorded in `docs/fork/gaps.md`. - **Default thread permissions** — `defaultRuntimeMode` (pingdotgg#11346). Reads fine, cannot be saved. Same `server.updateSettings` write path as above, one level deeper, not a separate gap. ## Backend behavior to consider reproducing in Moatless Upstream server-side work the fork cannot use directly, but that Moatless would benefit from: - **Queue messages during context compaction** (pingdotgg#11107, `ProviderCommandReactor.ts`) — a message sent while compaction is in flight is currently dropped rather than held. - **Restore provider history and prompts when rewinding** (pingdotgg#11338, `CheckpointReactor.ts`) — the counterpart to `thread.conversation.revert` above; rewinding the thread without rewinding provider state leaves the two out of sync. - **Detect file renames in review diffs** (pingdotgg#8086, `apps/server/src/vcs/GitVcsDriverCore.ts`) — a rename currently reads as a whole-file delete plus a whole-file add. - **Preserve qualified Codex model ids** (pingdotgg#9921, `ModelManifest.ts` + `CodexTextGeneration.ts`). - **Model defaults** astra-medium / fable-5.1-medium (pingdotgg#11347). All five are recorded under the runtime-fixes entry in `docs/fork/gaps.md`. ## Verification `verify.mjs` (full pass): 7 of 8 checks green — `duplicate-adds`, `tripwires`, `resolution-check`, `unsupported-methods`, `fmt:check`, `lint`, `typecheck`. `test` is red on **`@t3tools/desktop` only**, at `scripts/browser-secret-native.test.mjs > bundled libsecret helper`: `Command failed: pkg-config --cflags --libs libsecret-1`. This is the standing sandbox gap, not a merge regression — the test file's last commit is `498ab9c39` (pingdotgg#7261, before the merge base), `git diff --name-only` against both merge parents is empty for it, and `pkg-config --exists libsecret-1` fails in this environment. It is already an entry in `docs/fork/gaps.md`. Every other package passes, including `@t3tools/web` (5079 tests) after the `PreviewView.test.tsx` fix above. Three typecheck failures the merge introduced were fixed in it: `SETTINGS_CATEGORY_SCOPES` in `settingsSearch.ts` was missing all 9 fork-only settings paths, and two `filterAvailableSettingsSearchItems` literals in `settingsSearch.test.ts` were missing the fork's `forgejoEnabled` field. 🤖 Generated with [Claude Code](https://claude.com/claude-code) --- Moatless task: https://moatless.soaplabstest.com/tasks/e70b41b3-779d-43b8-8f34-7de516548e7c
github-actions Bot
added a commit
to omarcresp/t3code-flake
that referenced
this pull request
Sep 12, 2026
## What's Changed * feat(web): show recording status on floating previews by @maria-rcks in pingdotgg/t3code#11312 * fix(desktop): hold-to-quit no longer strands the quit by @maria-rcks in pingdotgg/t3code#11016 * feat(web): mark projects on another machine in project pickers by @maria-rcks in pingdotgg/t3code#11323 * fix(web): show pointer cursors on pull request controls by @shivamhwp in pingdotgg/t3code#11283 * fix(web): themed panel toggles show their disabled state by @flamboh in pingdotgg/t3code#11188 * fix(web): use branch wording in commit dialogs by @shivamhwp in pingdotgg/t3code#11281 * fix(mobile): keep Android file icons on the line with wrapped filenames by @SunkenInTime in pingdotgg/t3code#11234 * fix(codex): preserve qualified model ids in selection and generation by @maria-rcks in pingdotgg/t3code#9921 * feat(desktop): share macOS permission onboarding by @juliusmarminge in pingdotgg/t3code#11289 * fix(test): drain worker broadcasts before restoring browser globals by @maria-rcks in pingdotgg/t3code#11349 * fix(web): disable linked pull requests when none are linked by @maria-rcks in pingdotgg/t3code#11348 * fix(models): default to astra medium and fable 5.1 medium by @maria-rcks in pingdotgg/t3code#11347 * fix(web): align provider settings with shared settings rows by @maria-rcks in pingdotgg/t3code#10571 * feat(settings): configure default permissions for new threads by @maria-rcks in pingdotgg/t3code#11346 * fix: restore provider history and prompts when rewinding by @maria-rcks in pingdotgg/t3code#11338 * fix(web): keep comment actions visible when pr comments are folded by @maria-rcks in pingdotgg/t3code#11357 * feat: rewind conversations while keeping file changes by @maria-rcks in pingdotgg/t3code#11358 * fix(web): keep sidebar scroll position when pinning threads by @saphid in pingdotgg/t3code#10757 * fix(web): remove pr description reactions by @maria-rcks in pingdotgg/t3code#11361 * fix(desktop): keep preview keystrokes out of the composer by @maria-rcks in pingdotgg/t3code#11354 **Full Changelog**: pingdotgg/t3code@v0.0.41-nightly.20260911.1564...v0.0.41-nightly.20260912.1576 Upstream release: https://github.com/pingdotgg/t3code/releases/tag/v0.0.41-nightly.20260912.1576
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
qualified codex model ids were misclassified and auxiliary generation could dispatch an unqualified id. match known model families for defaults and classification while preserving live provider ids when dispatching.
verified with 37 focused tests, an 11-test manifest rerun, server typecheck, and scoped lint and formatting checks. fake-cli dispatch is covered; a native bedrock account was unavailable.
fixes #9659.
implemented with gpt-6-astra in codex.
Note
Medium Risk
Touches model default, legacy classification, and CLI dispatch paths for Codex; wrong family matching could mis-label models or pass the wrong
--model, though behavior is covered by focused tests.Overview
Adds
codexModelFamilyso Codex can compare model families (e.g.gpt-5.6-lunavsopenai.gpt-5.6-luna) without rewriting the provider’s wire slugs.Default and manifest behavior now family-match for Codex: preferred defaults, legacy/
currentModelsclassification, and manifest chat defaults still flip flags on the live catalog slug (qualified when Bedrock returns it), not an unqualified manifest id.Auxiliary
codex exectext generation takes the instance snapshot’s models and resolves the user’s selection to an exact slug or a family match before passing--model, so commit/title/branch helpers don’t dispatch bare ids when only qualified models exist.CodexDriverwires text generation after the managed snapshot so that list is available.Tests cover default ranking, manifest classification/defaults, and fake-CLI dispatch for both qualified and unqualified selections.
Reviewed by Cursor Bugbot for commit a798389. Bugbot is set up for automated code reviews on this repo. Configure here.
Note
Fix Codex model selection to preserve qualified live model IDs across manifest, provider, and text-generation layers
codexModelFamilyhelper in model.ts to strip provider qualification from Codex GPT slugs so qualified and unqualified IDs can be compared by shared family.isLegacyModelandapplyManifestDefaultin ModelManifest.ts now classify and resolve Codex defaults by family, moving the default flag to the qualified live slug while transferring aliases from any prior default.applyPreferredCodexDefaultModelin CodexProvider.ts matches preferred defaults by family instead of exact identifier, preserving the selected model's original wire slug.makeCodexTextGenerationin CodexTextGeneration.ts resolves the requested model by exact slug, then Codex family, then fallback, and passes the resolved qualified ID to the CLI.makeCodexTextGenerationandapplyManifestDefaultnow dispatch or select a different model ID than the requested unqualified family name when a matching qualified live model exists; callers relying on the unqualified slug being passed through verbatim will see the qualified ID instead.Macroscope summarized a798389.