Skip to content

sync: integrate upstream wave 2 through 652515a34 - #263

Merged
aaditagrawal merged 48 commits into
mainfrom
codex/sync-upstream-20260904-wave-2-bb46
Sep 5, 2026
Merged

sync: integrate upstream wave 2 through 652515a34#263
aaditagrawal merged 48 commits into
mainfrom
codex/sync-upstream-20260904-wave-2-bb46

Conversation

@aaditagrawal

@aaditagrawal aaditagrawal commented Sep 4, 2026

Copy link
Copy Markdown
Owner

What changed

Integrates upstream commits 41–81 through 652515a34, stacked on #262.

Included upstream work

  • Customizable project icons
  • Collapsed / resting composer
  • Inline assistant images
  • PR chrome, media unification, file-tree diffs
  • Vite 0.3 / lightningcss dedupe
  • Dev-share loopback bind fix

Fork adaptations

  • Keep title-regeneration failure on archived thread shells
  • Keep Claude skill dispatch when a message has attachments
  • Renumber upstream project-icon migration to append-only ID 52
  • Move oxlint manual-runtime baselines into lint config while preserving fork-only test ceilings
  • Keep vendored qrcodegen formatter ignores
  • Restore openingVideoAttachmentId after the composer merge

Stack

  1. sync: integrate upstream wave 1 through 355fbd96d #262 wave 1 → main
  2. This PR → wave 1
  3. Wave 3 → this branch (Antigravity + browser cookie import)
  4. Wave 4 → wave 3
  5. Wave 5 → wave 4 (upstream HEAD)

Verification

  • vp run typecheck passed (suggestions only)
  • All GitHub operations are fork-only. Upstream remains read-only.
Open in Web Open in Cursor 

maria-rcks and others added 30 commits September 2, 2026 22:03
@maria-rcks @cursoragent
fix(pull-requests): keep cached PR chrome on reopen (pingdotgg#9294)
d897641 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@juliusmarminge Julius Marminge @claude
feat(environments): draw each environment as the machine it runs on (p…
0fbb942 
…ingdotgg#9299)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
feat(web): apply and remove labels from the pull request tab (pingdot…
9ebbeda 
…gg#9313)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maria-rcks
fix(sidebar): collapse settled and snoozed shelves by default (pingdo…
31eeb44 
…tgg#9314)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@juliusmarminge Julius Marminge @claude
refactor(media): unify file and media previews across clients (pingdo…
922bd69 
…tgg#9253)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@maria-rcks
fix(chat): keep live tool labels in present tense (pingdotgg#9316)
ec44bc5 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@juliusmarminge Julius Marminge @claude
chore: audit lint directives and move plugin allowlists into config (p…
194f838 
…ingdotgg#9300)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
chore(ci): narrow the Effect conventions check-run agent (pingdotgg#9321
b9b1b8f 
)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
refactor(mobile): style plain views with Uniwind classes instead of t…
85f2479 
…he theme bridge (pingdotgg#9322)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
fix(dev): share dev servers on the loopback Vite actually binds (ping…
66419a1 
…dotgg#9324)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@tristanmanchester @claude
fix(web): line up the titlebar wordmark label and version pill (pingd…
12f1fc4 
…otgg#9255)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@juliusmarminge @claude
fix(web): make the diff layout toggle a persisted setting (pingdotgg#…
9409dd2 
…9326)

Co-authored-by: Claude Code <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
chore: dedupe lightningcss and tailwind node bindings (pingdotgg#9331)
3b2de9d 
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge @claude
chore: upgrade vite-plus to 0.3.0 (pingdotgg#9327)
f5fbb1b 
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@juliusmarminge Julius Marminge
@ShpetimA @claude
feat(web): add a file tree to the diff panel and pull request code tab (
1aa44a0 
pingdotgg#9330)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Shpetim <32248437+ShpetimA@users.noreply.github.com>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
@Yash-Singh1
feat(web): add PageUp/PageDown chat navigation (pingdotgg#9315)
5f84efa
@maria-rcks
fix(web): collapse PR header actions to icons when narrow (pingdotgg#…
2a3cfe4 
…9334)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@juliusmarminge
fix(web): resolve Vite sourcemap and supports warnings (pingdotgg#9343)
d42254d
@juliusmarminge
feat(web): choose whether links open in the default browser or in T3 …
18062da 
…Code (pingdotgg#9339)
@maria-rcks
fix(web): add press feedback to buttons (pingdotgg#9349)
6a5a18c 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@saphid @maria-rcks
feat(web): add customizable project icons (pingdotgg#9137)
f6c04c5 
Co-authored-by: maria <maria@kuuro.net>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@Adamulek123
fix(mobile): stop indented code overflowing Android chat bubbles (pin…
1575ada 
…gdotgg#9347)
@juliusmarminge @claude
fix(web): let the pull request list use wide screens (pingdotgg#9351)
0bc59bb 
Co-authored-by: Claude Code <noreply@anthropic.com>
@Yash-Singh1 @maria-rcks
feat: display native app and browser icons in work logs (pingdotgg#9093)
6cf0c6e 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@maria-rcks @cursoragent
fix(web): collapse oldest pull request comments (pingdotgg#9323)
48ba76b 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
@maria-rcks
fix(pull-requests): shared state + not settling? (pingdotgg#9332)
854541a 
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
@juliusmarminge
fix(web): stop usage summary requests reporting slow RPCs (pingdotgg#…
9f9359b 
…9358)
@flamboh @shivamhwp
feat(web): suggest ssh hosts in a dropdown under the host field (ping…
b5f4e81 
…dotgg#9171)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
@juliusmarminge @claude
feat(web): mod+w closes the active right panel tab before the window (p…
d4bd892 
…ingdotgg#9363)

Co-authored-by: Claude Code <noreply@anthropic.com>
@t3-code
test(web): remove static markup-only component tests (pingdotgg#9364)
5eb4f45 
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
t3dotgg and others added 4 commits September 3, 2026 02:33
@t3dotgg @claude
fix(web): stop the resting composer layout loop (pingdotgg#9393)
044ea8e 
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@t3dotgg @claude
fix(web): render assistant images inline in chat (pingdotgg#9126)
652515a 
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
@cursoragent @aaditagrawal
sync: integrate upstream wave 2 through 652515a
21edfe6 
Merge upstream commits 41-81, including project icons, collapsed
composer, inline assistant images, PR chrome, and media unification.

Fork adaptations:
- Keep title-regeneration failure on archived thread shells
- Keep Claude skill dispatch when a message has attachments
- Renumber upstream project-icon migration to append-only ID 52
- Move oxlint manual-runtime baselines into lint config while preserving
  fork-only test ceilings
- Keep vendored qrcodegen formatter ignores

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>
@cursoragent @aaditagrawal
fix(web): restore video-open loading state after composer merge
6ed8ca8 
Wave 2 dropped openingVideoAttachmentId from the timeline context while
keeping the attachment preview that reads it.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>
@github-actions 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). 📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. labels Sep 4, 2026
@github-actions

github-actions Bot commented Sep 4, 2026 •
edited
Loading

Copy link
Copy Markdown

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ No successful main baseline artifact is available yet. This run establishes the initial measurement.

Provider Metric Main baseline This PR Impact PR ceiling
Codex Total thread wire — 13.5 KiB — 15.1 KiB ✅
Codex Thread snapshot wire — 7.0 KiB — 7.3 KiB ✅
Codex Live turn WebSocket wire — 6.5 KiB — 7.8 KiB ✅
Codex Live turn WebSocket decoded — 57.0 KiB — 66.4 KiB ✅
Codex Live turn messages — 8 — 21 ✅
Claude Total thread wire — 13.5 KiB — 15.1 KiB ✅
Claude Thread snapshot wire — 7.0 KiB — 7.3 KiB ✅
Claude Live turn WebSocket wire — 6.5 KiB — 7.8 KiB ✅
Claude Live turn WebSocket decoded — 57.8 KiB — 66.4 KiB ✅
Claude Live turn messages — 8 — 21 ✅

Baseline: unavailable · PR result: 3161b7f · 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: 113.9 KiB
  • Claude decoded thread snapshot: 114.6 KiB

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

This was referenced Sep 4, 2026
Merged
Merged
Merged
cursoragent and others added 5 commits September 4, 2026 11:32
@cursoragent
fix(sync): restore attachment inline metadata and CI test expectations
79f716e 
Keep fork opaque-attachment claims while resolving inline documents with
fileName/mimeType and forcing downloads for other generic files. Accept
empty skillDispatchInput on promptless continuation, and mock expo-image
so the mobile ProviderIcon suite can load after Antigravity.
@cursoragent
chore: format wave 2 files for vp check
2fe44d4
@cursoragent
fix(web): drop unused react-hooks eslint-disable comments
dbf294c
@cursoragent
fix(sync): unblock CI after upstream merge leftovers
dba0bc5 
Stop duplicating Claude prompt text when there is no skill dispatch, keep
opaque attachment downloads flagged, assert only Codex binaries on the
binaryPath re-probe, and advertise Antigravity in PROVIDER_OPTIONS.
@cursoragent @aaditagrawal
merge: wave 1 ClaudeAdapter CI fixes into wave 2
3161b7f 
Keep wave 2's later prompt-last / image-first ClaudeAdapter behavior.
The wave 1 CI commits are already represented here.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>
@aaditagrawal
aaditagrawal marked this pull request as ready for review September 5, 2026 06:32
@aaditagrawal Graphite App

aaditagrawal commented Sep 5, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

This was referenced Sep 5, 2026
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@aaditagrawal Graphite App

aaditagrawal commented Sep 5, 2026 •
edited
Loading

Copy link
Copy Markdown
Owner Author

Merge activity

  • Sep 5, 7:41 AM UTC: A user started a stack merge that includes this pull request via Graphite.
  • Sep 5, 7:43 AM UTC: Graphite couldn't merge this PR because it had merge conflicts.

@aaditagrawal
aaditagrawal changed the base branch from codex/sync-upstream-20260904-wave-1-bb46 to graphite-base/263 September 5, 2026 07:42
@aaditagrawal
aaditagrawal changed the base branch from graphite-base/263 to main September 5, 2026 07:42
@aaditagrawal
aaditagrawal merged commit 714b427 into main Sep 5, 2026
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

📱 Native Change Changes the native fingerprint; merging blocks production OTAs until a new store build ships. size:XXL 1,000+ 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.