fix(threads): a merged PR settles its thread only once

[t3dotgg]

Two ways a merged PR wrongly hid a thread:

1. Creating a new thread at a repo root whose checked-out branch already had a merged PR settled the thread the moment it appeared. Reported on X by @learning4alpha.
2. Reviving an old thread whose PR had merged re-settled it as soon as the new turn finished, over and over.

Both are the same mistake: the settle rule treated any merged/closed PR as "this thread's work is done", forever. Settling on a merge should happen once. The status PR now carries the provider's updatedAt, and a terminal PR only auto-settles a thread while it is the thread's latest event. A new thread created after the merge, or any message sent after it, outranks the merge for good. Inactivity auto-settle and manual settle still work as before.

• Optional updatedAt on the status change request in contracts; old servers and clients interop unchanged.
• Server passes it through from the existing PR lookup. No per-provider work; where a provider doesn't report it, behavior is unchanged.
• Shared rule in client-runtime anchors on the thread's latest activity (falling back to creation time). Applied on web (sidebar partition, Woke pill, parked banner, header menu) and mobile (both thread lists).

Tests: age-gate and revival cases in threadSettled.test.ts, updated GitManager, web, and mobile suites. All targeted typechecks, lint, and format pass.

Changes by Claude Fable 5 running in Claude Code.

---

Note

Medium Risk
Changes when threads appear in settled lists across web and mobile; behavior is gated on new optional updatedAt with safe fallbacks when absent.

Overview
Fixes threads being auto-settled (or re-settled) when the branch’s merged/closed PR predates the conversation—e.g. new threads on an already-merged branch, or revived threads after a merge.

changeRequestAutoSettles now takes ChangeRequestSettleSource (state + optional updatedAt) and only treats a terminal PR as settling the thread when updatedAt ≥ the thread’s latest user-initiated activity (messages / turn requests, else creation). Missing or bad timestamps keep prior always-settle behavior for compatibility.

Contracts and GitManager expose optional PR updatedAt from gh; web and mobile thread lists, sidebar partition, Woke pill, parked banner, and action menus pass the full change request (and thread shell) into effectiveSettled instead of bare PR state.

^{Reviewed by Cursor Bugbot for commit 26af072. Bugbot is set up for automated code reviews on this repo. Configure here.}

Note

Fix thread auto-settlement to only trigger when a merged PR postdates thread user activity

• Introduces ChangeRequestSettleSource (state + updatedAt) throughout the stack, replacing plain PR state strings in settlement logic.
• changeRequestAutoSettles now compares the PR's updatedAt against the thread's user-activity anchor (createdAt, latestUserMessageAt, latestTurn.requestedAt), skipping settlement when the terminal PR predates user engagement.
• Falls back to legacy settle-always behavior when timestamps are missing or malformed, preserving compatibility with older servers.
• Server-side toStatusPr and the VcsStatusChangeRequest contract schema are extended to include updatedAt, propagated from the VCS provider.
• Behavioral Change: merged/closed PRs that predate a thread's user activity no longer auto-settle that thread; threads stay active until a qualifying newer terminal event occurs.

^{Macroscope summarized 26af072.}

[coderabbitai]

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro Plus

Run ID: 95f9d35f-629a-4c56-be9d-f70a1549f04d

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

• 🔍 Trigger review

---

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.

❤️ Share

• X
• Mastodon
• Reddit
• LinkedIn

_{Comment @coderabbitai help to get the list of available commands.}

[github-actions]

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	12.6 KiB	12.6 KiB	+13 B (+0.1%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.3 KiB	6.3 KiB	−6 B (−0.1%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.3 KiB	+19 B (+0.3%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	51.8 KiB	51.8 KiB	0 B (0.0%)	66.4 KiB	✅
Codex	Live turn messages	16	16	0 (0.0%)	21	✅
Claude	Total thread wire	12.6 KiB	12.6 KiB	+12 B (+0.1%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.3 KiB	6.3 KiB	−1 B (−0.0%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.3 KiB	+13 B (+0.2%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	52.7 KiB	52.7 KiB	0 B (0.0%)	66.4 KiB	✅
Claude	Live turn messages	16	16	0 (0.0%)	21	✅

Baseline: fe281c5 · PR result: 26af072 · Source CI: success

Scenario and decoded snapshot size

10 historical turns, 5 command tools per turn, 878.9 KiB retained MCP result per historical turn, and a 1.05 MiB retained result in the measured turn.

• Codex decoded thread snapshot: 99.9 KiB
• Claude decoded thread snapshot: 100.6 KiB

Updated in place by a trusted workflow. PR artifacts are strictly validated and never executed.

[macroscopeapp]

Approvability

Verdict: Approved at 26af072

Macroscope's review found this PR approvable — Bug fix ensuring merged PRs settle threads only once by tracking PR timestamps against thread activity. The author originally created this settling logic, and the fix includes comprehensive tests for edge cases (inherited old PRs, revived threads, missing timestamps).

^{You can add or adjust custom eligibility rules. Learn more.}

Dismissing prior approval to re-evaluate 187e7b0

[cursor]

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.}

^{Reviewed by Cursor Bugbot for commit 187e7b0. Configure here.}