Uh oh!
There was an error while loading. Please reload this page.
fix(threads): make completed-PR auto-settle configurable - #5643
Conversation
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the ⚙️ Run configurationConfiguration used: Repository UI Review profile: CHILL Plan: Pro Plus Run ID: You can disable this status message by setting the Use the checkbox below for a quick retry:
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. Comment |
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes using high effort and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Want fixes drafted automatically? Bugbot Autofix can create code changes for findings. A team admin can enable Autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit ca0ebbd. Configure here.
| // A snooze clears the same way as a settled override — sending a message | ||
| // to a snoozed thread is the user re-engaging, so the return ticket is spent. | ||
| const lifecycleResetEvents: Array<Omit<OrchestrationEvent, "sequence">> = []; | ||
| if (targetThread.settledOverride !== null) { |
There was a problem hiding this comment.
Pin leaves sticky keep-active
Medium Severity
Making the "active" override sticky across activity interacts poorly with pin promotion. Pinning a settled thread still emits thread.unsettled with reason "user", which stamps the same keep-active override; thread.unpin only clears pinnedAt. After unpin, later messages, sessions, and approvals no longer clear that override, so the thread never returns to inactivity or completed-PR auto-settle until the user settles it again—without ever choosing Un-settle.
Additional Locations (2)
Reviewed by Cursor Bugbot for commit ca0ebbd. Configure here.
JasperG134
commented
Aug 9, 2026
Confirmed this is needed on T3 Code Nightly 0.0.33-nightly.20260809.1043: inactivity auto-settlement was explicitly disabled, but a merged PR still caused threads to classify as settled. Disabling completed-PR auto-settlement is the required manual-only workflow when the inactivity setting is also off. The toggle itself is the right fix. To make this easier to land, I recommend keeping the PR single-purpose while rebasing onto current main: drop the unrelated sticky |
JasperG134
commented
Aug 9, 2026
I opened #5842 as a current- Fresh verification on #5842: 274 focused tests, all seven relevant package typechecks, and formatting for all 20 changed files. Maintainers can use whichever branch is easiest to land; #5842 is intended to minimize conflict and review scope. |
t3dotgg
commented
Aug 23, 2026
Note 🤖 GPT-5.6 Sol responding on behalf of Theo Closing this PR after an automated pass over open pull requests. Configurable automatic settlement already shipped in #5880. |
What Changed
Adds an independent Auto-settle completed pull requests setting for Sidebar v2. It defaults on for compatibility, but users can turn it off so merged or closed PR threads follow the ordinary inactivity rule instead.
Manual Un-settle is now a sticky keep-active choice. Later messages, sessions, approvals, and user-input activity no longer clear that choice; explicitly settled threads still wake when real work resumes.
The shared classification logic covers web and desktop. Mobile gets the same default and semantics through a device-local preference because it does not currently sync Client Settings.
Why
The existing inactivity auto-settle switch did not control completed PRs: merged or closed PR threads always settled. Activity also cleared a manual Un-settle override, so a thread linked to a completed PR could settle again immediately after every message.
This keeps the two automatic rules independent and makes the explicit user override durable.
UI Changes
No motion or timing behavior changed, so a video is not applicable.
Verification
Checklist
Model: GPT-5.6 via the Codex desktop harness, with Cursor Grok 4.5 as the builder and Claude Fable as the adversarial reviewer.
Note
Medium Risk
Touches orchestration lifecycle (sticky unsettle) and shared settled classification across web, mobile, and server; behavior changes are user-visible but covered by tests and default-on for compatibility.
Overview
Adds a separate Auto-settle completed pull requests control (default on) so merged/closed PR threads no longer always auto-settle when users turn it off—they follow the inactivity rule instead.
Manual Un-settle is now sticky: later messages, sessions, and approval/input activity no longer clear the
"active"override on the server; only explicit settle or waking an explicitly"settled"thread still applies.Web/desktop read the new
sidebarAutoSettleCompletedChangeRequestsclient setting everywhere thread settled state is computed (sidebar, chat, context menu). Mobile mirrors the same behavior via a device-local preference and wires it through Thread List v2. SharedeffectiveSettledgates PR-based auto-settle on the new flag.Reviewed by Cursor Bugbot for commit ca0ebbd. Bugbot is set up for automated code reviews on this repo. Configure here.