sync: port upstream settle/catch-up safety, remote-update rollback, and models/desktop/UI polish (#5151–#5304) by aaditagrawal · Pull Request #205 · aaditagrawal/t3code

aaditagrawal · 2026-08-06T02:50:13Z

L3/7 of the 2026-08-06 upstream sync stack. Stacked on L2.

What lands

Open-PR threads no longer auto-settle (fix: threads with open PRs no longer auto-settle pingdotgg/t3code#5151)
Bound thread catch-up replay; stop full-DB snapshot hydration (fix(server): bound thread catch-up replay and stop full-DB snapshot hydration pingdotgg/t3code#5147)
Dedicated worktree branch-drift PR linking (fix(server): follow branch drift in dedicated worktrees so PRs link to their thread pingdotgg/t3code#5159)
Rollback-safe remote updates + npx service update fix (fix(server): make remote updates rollback-safe pingdotgg/t3code#5181, fix(server): stop npx service updates from silently leaving the old server running pingdotgg/t3code#5217)
Legacy models folded into separate menus (feat: fold legacy models into separate menus pingdotgg/t3code#5190)
Desktop Linux scheme claim + Niri/Hyprland secret storage (fix(desktop): claim the t3code:// scheme default on Linux at startup pingdotgg/t3code#5054, fix(desktop): Niri/Hyprland - Linux secret storage backend pingdotgg/t3code#2916)
Terminal polish: cursor blink, Ctrl/Cmd+W hold, replayable query strip (fix(web): blink the terminal cursor again pingdotgg/t3code#5314, fix(terminal): protect held Ctrl/Cmd+W close shortcut pingdotgg/t3code#5322, fix(server): strip replayable terminal queries from history pingdotgg/t3code#5319)
Contracts: forward-compatible ServerProviders decode (fix(contracts): decode ServerProviders forward-compatibly pingdotgg/t3code#5327)
Chat code-block / error-alert / spacing / loading-theme polish

Fork deviations preserved

Claude provider keeps fork effort/context-window catalogs and Sonnet 5 constrained-context helpers while adopting upstream legacy-model menus

Verification

vp check and vp run typecheck pass.

Review after L2.

coderabbitai · 2026-08-06T02:50:21Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

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: defaults

Review profile: CHILL

Plan: Pro Plus

Run ID: 7d385014-416e-462e-908f-0a81eb9d703d

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

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

cursor · 2026-08-06T03:46:04Z

@coderabbitai review

…ydration (pingdotgg#5147) Co-authored-by: Claude Fable 5 <[email protected]>

…o their thread (pingdotgg#5159) Co-authored-by: Claude Fable 5 <[email protected]>

…g#4574)

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

…debug (pingdotgg#5076) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>

…erver running (pingdotgg#5217) Co-authored-by: Claude <[email protected]>

Co-authored-by: aaditagrawal <[email protected]>

…ingdotgg#5054)

…#2916) Co-authored-by: Julius Marminge <[email protected]>

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>

…g#5319)

…5327) Co-authored-by: Rodrigo Brechard <[email protected]>

Keep upstream legacy-model menu folding (isLegacy tagging) while preserving the fork Claude effort/context-window option catalogs and Sonnet 5 constrained-context helpers. Co-authored-by: aaditagrawal <[email protected]>

github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL 1,000+ effective changed lines (test files excluded in mixed PRs). labels Aug 6, 2026

cursor Bot marked this pull request as ready for review August 6, 2026 03:11

cursor Bot force-pushed the codex/sync-20260806-l2-pair-ghostty-search-63f7 branch from 42a7055 to ac47850 Compare August 6, 2026 03:27

cursor Bot force-pushed the codex/sync-20260806-l3-server-settle-ui-63f7 branch from 9de47de to a9b5840 Compare August 6, 2026 03:28

cursor Bot changed the base branch from codex/sync-20260806-l2-pair-ghostty-search-63f7 to main August 6, 2026 03:35

cursor Bot force-pushed the codex/sync-20260806-l3-server-settle-ui-63f7 branch 2 times, most recently from 76c1b73 to 3c8997e Compare August 6, 2026 03:44

cursor Bot force-pushed the codex/sync-20260806-l3-server-settle-ui-63f7 branch from 3c8997e to 81a1911 Compare August 6, 2026 03:59

cursor Bot changed the base branch from main to codex/sync-20260806-l2-pair-ghostty-search-63f7 August 6, 2026 04:00

cursor Bot force-pushed the codex/sync-20260806-l2-pair-ghostty-search-63f7 branch from 896984c to 686dcba Compare August 6, 2026 04:10

t3dotgg and others added 17 commits August 6, 2026 04:10

fix: threads with open PRs no longer auto-settle (pingdotgg#5151)

99984c9

fix(server): bound thread catch-up replay and stop full-DB snapshot h…

599b619

…ydration (pingdotgg#5147) Co-authored-by: Claude Fable 5 <[email protected]>

fix(server): follow branch drift in dedicated worktrees so PRs link t…

c211533

…o their thread (pingdotgg#5159) Co-authored-by: Claude Fable 5 <[email protected]>

fix(server): make remote updates rollback-safe (pingdotgg#5181)

3ca46e1

fix(web): stop settle controls overlapping the status label (pingdotg…

743bcfa

…g#4574)

fix: normalize app icon glyph sizing (pingdotgg#5202)

973d154

Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>

fix(server): surface cloudflared FTL/PNC relay logs as warnings, not …

4a7357b

…debug (pingdotgg#5076) Co-authored-by: Claude Opus 4.8 (1M context) <[email protected]>

fix(server): stop npx service updates from silently leaving the old s…

e9f4371

…erver running (pingdotgg#5217) Co-authored-by: Claude <[email protected]>

feat: fold legacy models into separate menus (pingdotgg#5190)

8760e5c

Co-authored-by: aaditagrawal <[email protected]>

fix(desktop): claim the t3code:// scheme default on Linux at startup (p…

9d11455

…ingdotgg#5054)

fix(web): polish interface spacing (pingdotgg#5252)

9d273b8

fix(desktop): Niri/Hyprland - Linux secret storage backend (pingdotgg…

0370928

…#2916) Co-authored-by: Julius Marminge <[email protected]>

fix(web): match loading screen to dark theme (pingdotgg#5303)

8dbb203

fix(web): blink the terminal cursor again (pingdotgg#5314)

89134ec

Co-authored-by: Claude Opus 5 (1M context) <[email protected]>

fix(terminal): protect held Ctrl/Cmd+W close shortcut (pingdotgg#5322)

0297c25

fix(server): strip replayable terminal queries from history (pingdotg…

2dd9f4f

…g#5319)

fix(contracts): decode ServerProviders forward-compatibly (pingdotgg#…

0d71d80

…5327) Co-authored-by: Rodrigo Brechard <[email protected]>

t3-code-bot Bot and others added 3 commits August 6, 2026 04:10

fix(web): simplify chat code blocks (pingdotgg#5301)

af24666

fix(web): align multiline error alert controls (pingdotgg#5304)

f1c73bf

fix: adapt upstream pingdotgg#5190 to fork

a4faae6

Keep upstream legacy-model menu folding (isLegacy tagging) while preserving the fork Claude effort/context-window option catalogs and Sonnet 5 constrained-context helpers. Co-authored-by: aaditagrawal <[email protected]>

cursor Bot force-pushed the codex/sync-20260806-l3-server-settle-ui-63f7 branch from 81a1911 to a4faae6 Compare August 6, 2026 04:11

cursor Bot deleted the branch main August 6, 2026 04:14

cursor Bot changed the base branch from codex/sync-20260806-l2-pair-ghostty-search-63f7 to main August 6, 2026 04:14

cursor Bot merged commit 4ba750c into main Aug 6, 2026
12 checks passed

cursor Bot deleted the codex/sync-20260806-l3-server-settle-ui-63f7 branch August 6, 2026 04:14

Navigation Menu

Repository navigation

sync: port upstream settle/catch-up safety, remote-update rollback, and models/desktop/UI polish (#5151–#5304) - #205

sync: port upstream settle/catch-up safety, remote-update rollback, and models/desktop/UI polish (#5151–#5304)#205
cursor[bot] merged 20 commits into
mainfrom
codex/sync-20260806-l3-server-settle-ui-63f7

aaditagrawal commented Aug 6, 2026

Uh oh!

coderabbitai Bot commented Aug 6, 2026 •

edited

Loading

Review skipped

Uh oh!

cursor Bot commented Aug 6, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Conversation

aaditagrawal commented Aug 6, 2026

What lands

Fork deviations preserved

Verification

Uh oh!

coderabbitai Bot commented Aug 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

cursor Bot commented Aug 6, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

coderabbitai Bot commented Aug 6, 2026 •

edited

Loading