Repository navigation
fix(gui): allow hidden models in Combo selectors - #7195
xianhongtao wants to merge 173 commits into
Conversation
merge dev into preview for the v2.33.0-preview.20260825 release (api-usage oracle fix)
…w-2340 [WRONG BRANCH] release: promote dev to preview for v2.34.0-preview.20260827
# Conflicts: # package.json
…w-2350 [WRONG BRANCH] promote dev onto preview for v2.35.0-preview
…w-23600829 [WRONG BRANCH] release: v2.36.0-preview.20260829
`preview` carries its own release-bump commits (`release: v2.36.0-preview.20260829`), which are not on `dev`, so the promotion cannot fast-forward: `package.json` is the only conflicting path. Resolved to the version this train publishes, `2.36.0-preview.20260830`, which moves the `preview` channel forward from the 20260829 tip. Every other path takes `dev` (`bb6a6fbdf`) unchanged.
…w-23600830 [WRONG BRANCH] promote dev onto preview for v2.36.0-preview.20260830
# Conflicts: # package.json
…ks up the ReDoS fix)
…w-23800831 [WRONG BRANCH] promote dev onto preview for v2.38.0-preview.20260831
…23900901 # Conflicts: # package.json
[WRONG BRANCH] promote dev onto preview for v2.39.0-preview.20260901
…w-24000902 release: promote dev to preview for v2.40.0-preview.20260902
…rkflow call (lidge-jun#3262) Both v2.40.0 release dispatches (33615174183 preview, 33615177849 main) died at startup_failure: a workflow_call cannot grant its callee more than the calling job holds, and dev-version-bump.yml's job declares contents+pull- requests write. lidge-jun#3129 wired the call but never dispatched a release, so this is its first live run. The caller job now declares exactly the callee's two permissions; no other job in release.yml gains anything. Co-authored-by: jun <jun@lidge.dev> (cherry picked from commit 7ce0ba5)
…w-relfix release: carry the release.yml permissions fix onto preview for v2.40.0-preview.20260902
Brings the reviewed dev head (81a1fc1) onto preview. The only conflict is package.json's version, resolved to the preview channel's next version rather than to either side: preview carried 2.40.0-preview.20260902 and dev carries 2.41.0, and neither is what this publish is. The 37-commit delta since v2.40.0 is reviewed per-commit in devlog/_plan/260903_muse_release_train/011_review_ledger.md.
…w-2410-v2 [WRONG BRANCH] release: v2.41.0-preview.20260903
…w-2410-v3 [WRONG BRANCH] release: refresh preview onto the audit-clean dev head for v2.41.0-preview.20260903
v2.41.0 published from main while this promotion was in flight, so the preview line has to move past it: a 2.41.0-preview version is now BEHIND a released one, which tests/release-version-line.test.ts refuses and npm would refuse after it. dev moved to 2.42.0 in lidge-jun#3354, the automatic post-release bump. Preview follows the same line at 2.42.0-preview.20260903, which is the conflict resolution here: neither side's value, because neither is what this publish is. Also brings the three CI timing-flake fixes from lidge-jun#3351, which is what preview CI failed on twice at 491ffcf. Preflight: 2.42.0-preview.20260903 unpublished on npm, no v2.42.0* tag, no GitHub release, and it moves preview forward from 2.40.0-preview.20260902.
…w-2410-v4 [WRONG BRANCH] release: v2.42.0-preview.20260903
…w-2420-badges [WRONG BRANCH] release: promote dev onto preview for the main-account badge fix
…view preview had diverged from main: it carried 28 merge commits main did not have, while main carried 23 preview did not, so preview could not fast-forward. The divergence was history only - the sole CONTENT difference between the two branches was the package.json version line. This merge takes main (48f8186, the v2.42.0 release commit) into preview and resolves the tree to main's content, so preview now matches the released tree exactly apart from its own prerelease version line. The version could not stay at 2.42.0-preview.20260903: v2.42.0 has published, and compareReleaseTags ranks that prerelease BEHIND its own stable release (-1), which is what tests/release-version-line.test.ts fails on. preview opens the next prerelease line at 2.43.0-preview.20260904, matching dev's 2.43.0.
…w-2430 [WRONG BRANCH] chore(release): promote main v2.42.0 onto preview and open 2.43.0-preview
….83.0-r2 [WRONG BRANCH] release: 2.83.0
[WRONG BRANCH] release: 2.84.0
…-2.85.0 [WRONG BRANCH] release: 2.85.0
…-2.86.0 [WRONG BRANCH] release: promote dev 494c50d to main as 2.86.0
Use the complete management catalog for Combo model selection independently of external model visibility. Bump the workspace cache version, cover hidden model selection and saving, and synchronize Combo documentation.
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info
📝 Walkthrough
Merge Risk: ⚪ Minimal · up to
|
|
✅ Deterministic PR hygiene checks passed. |
⏳ DRAFT
What to do
Review readiness checklist
0/4 boxes ticked. This pull request is being kept as a draft automatically. Once every issue above is resolved, it will be marked ready for review again. |
|
Being carried into #7223 with your authorship preserved; this PR will be closed when the bundle lands. |
…d Gentle Shell (#7195, #6767, #6691, #7213) (#7223) Carried from #7195, #6767, #6691, #7213 (one commit per source PR, original authors preserved). #4649 held for security review. Security review follow-up: the Windows picker relay binds only when picker activation or selected-profile recovery needs it. Remote validation (hosted GitHub Actions unreliable; local tests not run by maintainer rule): union candidate codex/prr-integ-8 = dev c03eafd + #7224 + #7223 + #7225 + #7217 + #6454 + #6594 plus a Gentle Shell import-cycle fix (integ-9 e1f289c: typecheck + full suite on mini (Windows) and lidge (Linux), compared with the same host's dev runs) and a test-only Windows path-escaping fix for the reasoning-retention routing test (integ-10 0d4cba7, tree a2b309a: that file re-run on both hosts). Co-authored-by: xianhongtao <xianhongtao2022@outlook.com> Co-authored-by: 김민우 <minwokim@gmarket.com> Co-authored-by: hyuntae park <bluestar218ht@gmail.com> Co-authored-by: randalo-trc <randalo@trociuk.com>
…7252) The carry-attribution window is capped at 80 characters and could cut a reference in half. The #7223 subject "carry ... (#7195, #6767" was read as #676, an unrelated PR, so the hygiene gate demanded a co-author trailer for the wrong person (seen on the 2.87.0 promotion #7249). When no sentence boundary falls inside the window, the window now finishes a number that started before the cap. Sentence and newline bounds, qualified-reference handling, and the exclusion of references that start after the cap are unchanged.
Summary
Make it easier to use Combos to organize and simplify the model list exposed to clients.
Users may want to expose a few named Combos while hiding their underlying provider models to keep the client model picker tidy. Previously, hiding a provider model also removed it from the Combo target picker, forcing users to make it visible again before adding it to a Combo.
This PR separates external model visibility from internal Combo configuration:
Users can now keep their client-facing model list focused on Combos while freely selecting the underlying models when configuring them.
Verification
Passed:
bun test tests/combo-capability-hidden-targets.test.tsx tests/page-loading-contract.test.tsx— 30 passed, 0 failed.bun run buildbun run typecheckbun run structure:checkbun install --frozen-lockfileandbun run buildgit diff --checkRegression coverage includes hidden-model selection and saving, all-hidden catalogs, old-cache isolation, capability metadata, and JEV decision-model suggestions.
Validation was scoped to focused regression tests, type checking, and builds for this GUI-only behavior change. The full repository test suite was not run.
Checklist
Summary by CodeRabbit
Review readiness checklist
This PR stays in draft until every box below is ticked. Tick all four boxes once the requirements are met:
Required local validation passed; commands, results, and any full-suite exception are documented.
I pushed my PR to a recent dev commit (at most 10 behind; a maintainer may still ask for the exact tip before merge).
I resolved all correct Codex and CodeRabbit findings.
My PR is ready for review.