fix(web): settle shortcut moves to the next thread like the sidebar

[t3dotgg]

Pressing the settle shortcut (thread.settle, mod+shift+s) settled the open thread but left it open. The sidebar Settle button settles it and then opens the next active thread, or a new draft in the same project when none is left. The two should behave the same.

Fix

The sidebar now registers its existing settle action (attemptSettle, which plans the forward navigation) in a small module, apps/web/src/settleAndAdvance.ts. The shortcut calls it, so both paths share the same "next thread" logic. Nothing about which thread counts as next changes.

• On an already-settled thread, the shortcut still un-settles it.
• When the new sidebar is not mounted (legacy sidebar, or a narrow window where the sidebar sheet is closed), the shortcut settles in place, as before.
• A second press now settles the next thread instead of restoring the one you just settled. mod+z (undo) still un-settles it without moving you back, and the sidebar Settled section or that thread's banner can restore it too. This is the trade-off discussed in the issue.

Not changed: Settle thread in the chat title menu. Its code documents that it stays on the thread by design. Mobile has no settle shortcut and settles only from the thread list, so it needs no change.

Proof

• New apps/web/src/settleAndAdvance.test.ts (3 tests). With the module stubbed to main's behavior (the shortcut never reaches the sidebar), 2 of 3 fail. With the fix, all pass.
• tsc-rs --noEmit in apps/web passes. vp lint on the changed files has no errors.
• No screen capture was made: this change was made without a browser. Before: settle with the shortcut and the settled thread stays open. After: the app opens the next active thread, the same one the sidebar Settle button picks.

Fixes #16090

Reviewed with sol-loop: 1 round with GPT-6.1 Sol.

Model and harness: Claude Opus 5.5 in Claude Code via T3 Code.

🤖 Generated with Claude Code

[macroscopeapp]

Approvability

Verdict: Approved at 4f0d54c

Macroscope's review found this PR approvable — This is a focused web bug fix that routes the existing settle shortcut through the Sidebar’s established settle-and-advance behavior, with a small tested registration bridge and an unchanged fallback path. It does not alter schemas, defaults, deployment, security-sensitive code, or static-analysis settings.

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

[coderabbitai]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

• Configuration used: Path: .coderabbit.config.ts
• Review profile: CHILL
• Plan: Team
• Run ID: 168ee0b0-2f1c-4fd6-ac2c-f7cf0744e1fd

📥 Commits

Reviewing files that changed from the base of the PR and between 3213a0c and 4f0d54c.

📒 Files selected for processing: 4

• apps/web/src/components/ChatView.tsx
• apps/web/src/components/Sidebar.tsx
• apps/web/src/settleAndAdvance.test.ts
• apps/web/src/settleAndAdvance.ts

Limit details: You’ve used all 10 included reviews currently available. Your 21 included PR review attempts over the past 7 days set your current allowance at 10 reviews per hour.

📝 Walkthrough

The thread-settle shortcut now tries the sidebar’s registered settle-and-advance handler. If no handler is registered, it uses the existing thread-settle path. Tests cover handler dispatch and registration cleanup.

Changes: Settle shortcut navigation

Layer / File(s)	Summary
Settle-and-advance handler apps/web/src/settleAndAdvance.ts, apps/web/src/settleAndAdvance.test.ts	A registration API stores the current handler, and the dispatcher invokes it when present. Tests cover dispatch, the no-handler result, and registration cleanup order.
Shortcut integration apps/web/src/components/Sidebar.tsx, apps/web/src/components/ChatView.tsx	The sidebar registers its existing settle action. The thread-settle shortcut tries the registered handler first, then uses the existing settle path if the handler does not run.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix · Severity of issue fixed: Low

Suggested reviewers: maria-rcks

Merge Risk: ⚪ Minimal · up to 4f0d5

The shortcut is wired to the sidebar settle action while retaining its fallback. No merge-blocking issue is established.

Pre-merge checks: 4

Passed checks: 4 passed

Check name	Status	Explanation
Linked Issues check		Issue [#16090] requires the thread.settle shortcut to use the sidebar settle behavior. Sidebar.tsx registers its existing attemptSettle action. ChatView.tsx calls `settleAndAdvance(activeThrea…
Out of Scope Changes check		The changes stay within issue [#16090]. The new registration module connects the shortcut to the existing sidebar action. The ChatView.tsx and Sidebar.tsx changes implement that connection. The ne…
Title check		The title clearly and concisely describes the main change: the settle shortcut now moves to the next thread like the sidebar.
Description check		The description includes the problem, implementation, scope, linked issue, behavior details, and focused verification results. It also states that no screen capture was made, so the required before/af…

✨ Finishing Touches

📝 Generate docstrings

• Commit to this branch
• Create a new PR

🧪 Generate unit tests (beta)

• Commit to this branch
• Create a new PR

• Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

_{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	5.0 KiB	4.9 KiB	−30 B (−0.6%)	6.8 KiB	✅
Codex	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Codex	Live turn WebSocket wire	1.2 KiB	1.2 KiB	−30 B (−2.5%)	2.0 KiB	✅
Codex	Live turn WebSocket decoded	20.9 KiB	20.8 KiB	−41 B (−0.2%)	29.3 KiB	✅
Codex	Live turn messages	2	1	−1 (−50.0%)	8	✅
Claude	Total thread wire	5.0 KiB	5.0 KiB	0 B (0.0%)	6.8 KiB	✅
Claude	Thread snapshot wire	3.8 KiB	3.8 KiB	0 B (0.0%)	4.9 KiB	✅
Claude	Live turn WebSocket wire	1.2 KiB	1.2 KiB	0 B (0.0%)	2.0 KiB	✅
Claude	Live turn WebSocket decoded	21.2 KiB	21.2 KiB	0 B (0.0%)	29.3 KiB	✅
Claude	Live turn messages	2	2	0 (0.0%)	8	✅

Baseline: 3213a0c · PR result: 4f0d54c · 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: 108.5 KiB
• Claude decoded thread snapshot: 108.8 KiB

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