Skip to content

sync: record upstream/main ancestry for 2026-08-08 - #221

Merged
cursor[bot] merged 80 commits into
mainfrom
codex/sync-20260808-l7-ancestry-a13c
Aug 8, 2026
Merged

sync: record upstream/main ancestry for 2026-08-08#221
cursor[bot] merged 80 commits into
mainfrom
codex/sync-20260808-l7-ancestry-a13c

Conversation

@aaditagrawal

Copy link
Copy Markdown
Owner

Summary

Layer 7 (final) of the 2026-08-08 upstream sync stack. Empty-tree git merge -s ours upstream/main so the fork becomes a descendant of upstream tip 2c7267ad4 after the layered cherry-pick stack (L1–L6).

Stacked on #220 (codex/sync-20260808-l6-sidebar-default-a13c).

Verification

  • git merge-base --is-ancestor upstream/main HEAD → true
  • git rev-list --count HEAD..upstream/main0 (fully up to date)
  • git diff HEAD^1 HEAD → empty

Stack

  1. sync: port upstream server settle, tunnel/update safety, and early web polish (#5482–#5486) #215 L1 → main
  2. sync: port upstream pagination, reconnect settle, and Claude subagent safety (#5556–#5573) #216 L2 → L1
  3. sync: port upstream plan fold and per-device provider settings (#5558–#5580) #217 L3 → L2
  4. sync: port upstream theme library, Done/Woke, and runtime mode (#5226–#5440) #218 L4 → L3
  5. sync: port upstream mobile UX, pin ordering, browser history, and sidebar polish (#5415–#5633) #219 L5 → L4
  6. sync: port upstream sidebar v2 default, Stop button, and late polish (#5554–#5677) #220 L6 → L5
  7. This PR L7 → L6

After this lands on main, prepare the fork release (next after 0.0.32).

Open in Web Open in Cursor 

t3dotgg and others added 30 commits August 6, 2026 02:34
The version-skew banner is no longer an amber warning: it reads
"Server update available" with the raw versions (unreadable for
nightlies) moved to a tooltip. The in-flight rail (Download/Install/
Resume) becomes a single status row, "Downloading…" then
"Restarting…", since the wire installing stage is a sub-second
launcher handoff and "resuming" meant nothing to most people.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Measured on a live update: the server was back in ~9s but stayed
unreachable for ~96s, because releasing the tunnel on shutdown forces
the replacement tunnel's hostname route through 1-2 minutes of edge
propagation. An update handoff always brings a server right back
(new version or rollback), so the tunnel is never orphaned; skip the
release when the launcher state file records a pending update. The
next boot respawns the connector from the stored config against the
same tunnel and is reachable as soon as it connects.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
…pdate

A pending update in the launcher state is not proof a replacement
server is coming: `t3 service uninstall` or `systemctl stop` during
the pending window also tears the server down, permanently. The
launcher now writes a stop marker before signalling its child on an
explicit stop and clears it on the next start; the shutdown tunnel
release keeps the tunnel only for pending updates without the marker.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
A tool.updated row is the in-flight snapshot of a call; once the call
completes, the tool.completed row carries the final state and both
clients fold every matching update into it. Shipping the updates buys
nothing: 47k such rows exist in one real database, and a single thread
carries 3,291 of them.

Filter them out of thread snapshots, mirroring the existing
context-window dedup. Matching is per turn and only against a LATER
completion, so a revert that discards the completing turn cannot leave
a call unrepresented, and a later update under the same identity (the
next call, still in flight) survives. Live events are untouched.

Rows are matched on the same identity the clients collapse by: an
explicit data.toolCallId when the adapter emits one, otherwise the
itemType/title/detail triple. No tool lifecycle row in the real db
carries a toolCallId, so the fallback does the work.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
… test

Bugbot flagged that clients collapse only adjacent lifecycle rows, so
dropping a superseded update separated by an interleaved parallel call
diverges from full-history rendering. Measured on a real database: 1.5%
of dropped rows (553/36,581), all pure in-flight state whose final result
the retained completion still shows, and zero dropped rows carry a
client-merged payload field their completion lacks (verified across all
49,515 update rows). Documents the tradeoff and adds a test pinning it.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…ut an origin remote (pingdotgg#5556)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…otes (pingdotgg#5547)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…k log (pingdotgg#5559)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ic error (pingdotgg#5557)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tgg#5493)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: t3-turbo-simulation <simulation@t3turbo.local>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Theo Browne <me@t3.gg>
… bottom (pingdotgg#5566)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
t3dotgg and others added 4 commits August 7, 2026 18:09
…ngdotgg#5673)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…bagents (pingdotgg#5677)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Aug 8, 2026

Copy link
Copy Markdown

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: b28982e2-9156-4360-8f89-7047058056bc

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.

@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XS 0-9 effective changed lines (test files excluded in mixed PRs). labels Aug 8, 2026
@cursor
cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 7093c2d to 68be633 Compare August 8, 2026 07:25
@cursor
cursor Bot force-pushed the codex/sync-20260808-l7-ancestry-a13c branch from 234380d to b13c9d2 Compare August 8, 2026 07:26
@cursor
cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 68be633 to 7c81b89 Compare August 8, 2026 07:29
@cursor
cursor Bot force-pushed the codex/sync-20260808-l7-ancestry-a13c branch from b13c9d2 to f212535 Compare August 8, 2026 07:29
@cursor
cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 7c81b89 to 83ca7ab Compare August 8, 2026 07:31
@cursor
cursor Bot force-pushed the codex/sync-20260808-l7-ancestry-a13c branch from f212535 to 74aee92 Compare August 8, 2026 07:31
@cursor
cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 83ca7ab to 42375ff Compare August 8, 2026 07:33
@cursor
cursor Bot force-pushed the codex/sync-20260808-l7-ancestry-a13c branch from 74aee92 to 4eb9419 Compare August 8, 2026 07:33
ipanasenko and others added 9 commits August 8, 2026 07:39
…res (pingdotgg#5664)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ngdotgg#5673)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…bagents (pingdotgg#5677)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>
Empty-tree merge so fork main becomes a descendant of upstream/main
tip 2c7267a after the layered cherry-pick stack.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>
@cursor
cursor Bot force-pushed the codex/sync-20260808-l6-sidebar-default-a13c branch from 42375ff to ad7de88 Compare August 8, 2026 07:39
@cursor
cursor Bot force-pushed the codex/sync-20260808-l7-ancestry-a13c branch from 4eb9419 to 50af1f0 Compare August 8, 2026 07:39
@aaditagrawal
aaditagrawal marked this pull request as ready for review August 8, 2026 07:40
@cursor
cursor Bot changed the base branch from codex/sync-20260808-l6-sidebar-default-a13c to main August 8, 2026 07:49
@cursor
cursor Bot merged commit 23a6577 into main Aug 8, 2026
15 of 17 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XS 0-9 effective changed lines (test files excluded in mixed PRs). vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.