You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
Restore provider defaults from the model picker - #33395
Choose Default to remove a chat’s model override and keep the provider’s verified default visible.
What Changed
Adds capability-gated model reset and verified execution-host default metadata across desktop and mobile. Reset ownership, pending sends and newer option writes remain fenced; effort/Fast changes keep Default selected. This refresh preserves upstream live option snapshots and capability tree shaking. The existing setOptionPlan is mechanically split to retain the 300-line limit.
Why
Selecting a concrete chat model permanently replaced the global default without a reset action. The reset reuses the existing options pipeline and saved launch settings instead of adding another preference system.
No current-head before/after capture was produced for this refresh. Automated UI and send-lifetime tests pass; rendered, authenticated-provider and physical-device acceptance remain pending.
Testing
Current head: 21e632727ebfb3166fbb125abbb4e12de85ecc5f. Ordinary forward merge of upstream main 8a4dd3a7bb9bd7f96b68dec621433431d77dc8c1. Updated affected imports to their current owners.
All five desktop/runtime TypeScript projects pass with the supported tsrs compiler. The complete affected source test files pass 220 tests. Mobile application typecheck passes. The affected mobile selection passes 74 tests.
Normal commit hooks pass. Final changed-path gate: all non-unit checks passed; broad related-unit selection exceeded the one-minute limit and remains incomplete locally. No new installed-app/device, live-provider, SSH, Windows or Linux acceptance is claimed for this maintenance refresh.
Risk
Level: Medium
Saved launch settings and async model writes are the main risks: stale responses could restore an override or send with the wrong choice. Generation, record and host capability fences remain in place. A plain revert removes the reset UI; it cannot restore overrides already cleared by the user.
AI Disclosure
Implemented and checked with Codex assistance. The contributor owns the change and validation.
Review
The reset-generation marker and mobile pending-model send findings remain fixed. Host regressions also cover saved-only metadata reads, no extra catalog probes, Default persistence through effort picks, and damaged-runtime option replay.
Agent skill upstream boundary
Not applicable; this change copies no upstream skill-installer implementation or documentation.
Notes
Optional capability gating preserves independently updated desktop/mobile clients and execution hosts. The current ordinary merge retains the original contribution and upstream ancestry; validation above describes the current head.
Checklist
This PR is focused on the feature described above
What changed, why, risk and rollback are described
Earlier visual evidence or N/A reason is included
Self-reviewed for correctness, security and performance
Cross-platform, remote, folder-workspace, mobile and mixed-version impact considered
Full lint, typecheck, test and build gates pass at this head
It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.
No actionable comments were generated in the recent review.
Walkthrough
The changes add configured model-default metadata and reset operations for structured sessions. They add explicit queued delivery and steering for drafts, plus host-gated queued-message reordering. Desktop and mobile interfaces expose these controls and handle capability-dependent states. Shared contracts, host behavior, and tests cover these changes.
No actionable merge-blocking issue is established by the available evidence; merge after the normal checks complete.
Pre-merge checks: 2 · 2
Failed checks: 2 warnings
Check name
Status
Explanation
Resolution
Out of Scope Changes check
The pull request includes changes that do not implement the Default/reset requirement in [#13794]. Examples include queued-message movement and RPC support, steer-draft transport and keyboard behavior…
Remove or split the queued-message movement, steer-draft, queue-follow-up settings, and related RPC, capability, UI, and test changes into separate pull requests. Keep changes required for the Default choice, model-override reset, compatibi…
Description check
The description is focused and covers the change, motivation, linked issue, testing, risk, AI disclosure, compatibility notes, and rollback. However, this UI change does not provide the required befor…
Attach current before-and-after screenshots or a video that shows the model-picker reset behavior. If there is truly no visual or interaction change, replace the current Visual Proof text with N/A and briefly explain why.
Passed checks: 2 passed
Check name
Status
Explanation
Linked Issues check
[#13794] The model picker adds a Default action and uses a reset path instead of a synthetic model value. The reset path clears the persisted model override and preserves the effective host default wh…
Title check
The title clearly and concisely describes the primary change: restoring provider defaults through the model picker.
Full details: Linked Issues check
Explanation
[#13794] The model picker adds a Default action and uses a reset path instead of a synthetic model value. The reset path clears the persisted model override and preserves the effective host default when verified; it reports Default model not reported when the host cannot prove that default. Capability-gated wiring covers older hosts. Focused desktop, host, and mobile tests cover reported and unknown defaults, reset behavior, legacy hosts, and future-message handling.
Full details: Out of Scope Changes check
Explanation
The pull request includes changes that do not implement the Default/reset requirement in [#13794]. Examples include queued-message movement and RPC support, steer-draft transport and keyboard behavior, queue-follow-up settings, and related capability and UI changes. The stacked-PR description does not make these changes part of [#13794].
Resolution
Remove or split the queued-message movement, steer-draft, queue-follow-up settings, and related RPC, capability, UI, and test changes into separate pull requests. Keep changes required for the Default choice, model-override reset, compatibility, and their tests for [#13794].
Full details: Description check
Explanation
The description is focused and covers the change, motivation, linked issue, testing, risk, AI disclosure, compatibility notes, and rollback. However, this UI change does not provide the required before-and-after visual proof and does not use the required N/A explanation.
Resolution
Attach current before-and-after screenshots or a video that shows the model-picker reset behavior. If there is truly no visual or interaction change, replace the current Visual Proof text with N/A and briefly explain why.
Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 2 remain after this review.
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 7 remain after this review.
The reason will be displayed to describe this comment to others. Learn more.
Caution
Some comments are outside the diff and can’t be posted inline due to GitHub limitations.
⚠️ Outside diff range comments (1)
Minor · Block sends while the model write is pending. · use-mobile-structured-agent-options.ts:253-255
mobile/src/session/use-mobile-structured-agent-options.ts:253-255 🗄️ Data Integrity & Integration | 🟡 Minor | ⚡ Quick win
Block sends while the model write is pending.
When pendingOptionRef.current === 'model', sendSelection() returns undefined. The send path still calls sendMobileStructuredAgentSessionMessage, and its conditional spread omits options. The message can therefore reach the host without the model the user just selected. Wait for the model write to finish or reject the send while it is pending.
Review info
Run configuration
Source mode: Auto
Repository: Unavailable
Branch: Unavailable
File: No configuration file from this repository applied
Commit: Unavailable
Layers: Repository UI
Review profile: CHILL
Plan: Advanced
Run ID: de5e92c8-bf49-4d98-b85a-b3318b4e179a
Commits
Reviewing files that changed from the base of the PR and between a022931 and 6d82a1d.
Included review availability: This review used your included allowance. Your plan provides up to 10 included reviews per hour; 0 remain after this review.
Addressed the outside-diff finding in review 5641749074 with commit 6aa4da54c1bb905c46c0ff3815eef090dbf30487.
The mobile send seam now reads the existing pending-model ref independently of sendOptions support and rejects a message while either an explicit model pick or Default reset is in flight. The composer uses the same readiness check before clearing its draft; a rejected attempt creates no send RPC, accepted optimistic row, or unknown hold. Once the write settles, a fresh send carries the accepted explicit selection, while Default, unknown original models, and older hosts retain their valid no-options behavior. Host commands keep their existing dispatch path.
Validation on Node 24.22.0 with ORCA_BACKGROUND_LAUNCH=1:
Red: the actual useMobileStructuredAgentSession harness reproduced four wrongly accepted sends with delayed model/reset RPCs on modern and legacy hosts.
Green: 200 targeted mobile tests passed across 21 files; the final send regression file passed all 28 tests, including same-tick draft preservation, failed writes, and session-switch mutation ownership.
Mobile application typecheck, mobile test-typecheck ratchet (1,109 files; 98 existing grandfathered files; baseline unchanged), Node/web typechecks, changed-lines quality gate, and normal commit hooks passed.
Pushed to gentslava: gentslava/upstream-model-default. This finding has no inline thread to resolve.
Addressed the Out of Scope warning in ordinary forward cleanup 8827c8c20bc058570b123ee65432629ed6d4058b. The final effective contribution against pinned main 7d6603aa1766eb4cac079f8d6d2f4e67f251574a is 73 paths (+2,798/-441), down from 125; all 54 restored original paths match main exactly. Queue movement and its journal/RPC/capability/UI/tests, steer-draft transport/execution/keyboard behavior, queue-follow-up settings, and unrelated desktop/mobile future-turn picker behavior were removed. The PR description no longer claims a #33362 stack, and #13794's requirements were not broadened.
The retained change is Default/model-override reset, verified execution-host default preview, optional compatibility metadata/guards and their regression coverage. Existing baseline queue coverage ensures an accepted reset leaves already running/queued choices intact. Existing mechanical splits preserve baseline behavior under unchanged size limits.
Independent review also reproduced a P2 in the retained Default feature: an accepted effort pick could recreate the saved concrete model override. 6a2f2fc36d18919a5c9f95e899c86e94749fdaf2, followed by import correction d743c214145ebfe5beb263a31098b0f3fcbe000e, passes actual requested-option intent through the existing projection and sends adoptModelAsLaunchDefault: false for effort/Fast while Default is selected. Sparse/full host replies preserve inheritance and model-scoped values; explicitly selecting the same concrete model still exits Default. Independent actual-producer/schema/settings/new-launch probes reproduce the parent failure and pass at the final repair.
At exact published d743c214145ebfe5beb263a31098b0f3fcbe000e, final author qualification passed 103 whole desktop/shared/runtime files / 1,144 tests, 23 mobile files / 231 tests, four actual Bun CI projects, both mobile typechecks, changed-quality over 72 sources with zero new findings, catalog/generator/format/unchanged-ratchet gates and normal hooks. The cleanup-hook pass is author-attested from the archived tool receipt, without a separate raw log; repair/import hook logs are retained. This is bounded local evidence: complete repository lint/typecheck/test/build and full-app/live/device acceptance remain unclaimed, and upstream PR Checks still require maintainer approval. The scope warning is a top-level comment, with no inline thread to resolve.
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
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.
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
ELI5
Choose Default to remove a chat’s model override and keep the provider’s verified default visible.
What Changed
Adds capability-gated model reset and verified execution-host default metadata across desktop and mobile. Reset ownership, pending sends and newer option writes remain fenced; effort/Fast changes keep Default selected. This refresh preserves upstream live option snapshots and capability tree shaking. The existing setOptionPlan is mechanically split to retain the 300-line limit.
Why
Selecting a concrete chat model permanently replaced the global default without a reset action. The reset reuses the existing options pipeline and saved launch settings instead of adding another preference system.
Linked Issue
Fixes #13794
Visual Proof
No current-head before/after capture was produced for this refresh. Automated UI and send-lifetime tests pass; rendered, authenticated-provider and physical-device acceptance remain pending.
Testing
Current head:
21e632727ebfb3166fbb125abbb4e12de85ecc5f. Ordinary forward merge of upstream main8a4dd3a7bb9bd7f96b68dec621433431d77dc8c1. Updated affected imports to their current owners.All five desktop/runtime TypeScript projects pass with the supported tsrs compiler. The complete affected source test files pass 220 tests. Mobile application typecheck passes. The affected mobile selection passes 74 tests.
Normal commit hooks pass. Final changed-path gate: all non-unit checks passed; broad related-unit selection exceeded the one-minute limit and remains incomplete locally. No new installed-app/device, live-provider, SSH, Windows or Linux acceptance is claimed for this maintenance refresh.
Risk
Level: Medium
Saved launch settings and async model writes are the main risks: stale responses could restore an override or send with the wrong choice. Generation, record and host capability fences remain in place. A plain revert removes the reset UI; it cannot restore overrides already cleared by the user.
AI Disclosure
Implemented and checked with Codex assistance. The contributor owns the change and validation.
Review
The reset-generation marker and mobile pending-model send findings remain fixed. Host regressions also cover saved-only metadata reads, no extra catalog probes, Default persistence through effort picks, and damaged-runtime option replay.
Agent skill upstream boundary
Notes
Optional capability gating preserves independently updated desktop/mobile clients and execution hosts. The current ordinary merge retains the original contribution and upstream ancestry; validation above describes the current head.
Checklist