sync: integrate upstream wave 1 through 355fbd96d - #262

Merged

aaditagrawal merged 48 commits into

mainfrom

codex/sync-upstream-20260904-wave-1-bb46

Sep 5, 2026

aaditagrawal commented Sep 4, 2026 •

edited by cursor Bot

Loading

Owner

What changed

Integrates the first 40 upstream commits after merge-base 14f15cfed, through 355fbd96d.

This is layer 1 of a 5-PR stack catching the fork up to pingdotgg/t3code main (190 unique commits behind as of 2026-09-04).

Included upstream work

Continue active threads across server restarts
Provider editor / models list redesign
Desktop preview browser profiles
Document attachment previews
Cursor auto/full-access mode handling
Automatic pull of clean default branches
Settlement timestamp repair
Web/mobile composer, sidebar, and markdown polish

Fork adaptations

Keep Cursor on the TypeScript SDK; port auto/full-access onto SDK local options (sandboxOptions / autoReview). CursorAcpSupport stays deleted.
Renumber upstream auto-pull and settlement-repair migrations to append-only IDs 50 and 51.
Preserve opaque .bin attachment metadata while adding inline document previews.
Keep the Windows Spectre runtime component IDs from the fork release fix.
Preserve Hermes companion UI, Night sky artwork, and provider-aware runtime modes.
Retarget fork-only migration tests to @t3tools/shared/nodeSqliteClient.

CI follow-up

Restored the trailing no-dispatch text push in ClaudeAdapter after skipping duplicate prompt+command blocks, so literal prompts, /compact, and ultrathink still reach the SDK. Image attachments stay ahead of that text block (required for slash-command expansion); the adapter test now expects that order.

Stack

This PR → main (commits 1–40)
Wave 2 → this branch (commits 41–81)
Wave 3 → wave 2 (Antigravity + browser cookie import)
Wave 4 → wave 3 (settings reorg, usage limits, compaction)
Wave 5 → wave 4 (remainder through upstream HEAD)

Verification

vp run typecheck passed (suggestions only)
Focused ClaudeAdapter tests and GitHub CI follow on this branch
All GitHub operations are fork-only (aaditagrawal/t3code). Upstream remains read-only.

Checklist

This PR is small and focused relative to the 190-commit gap
I explained what changed and why
I included before/after screenshots for any UI changes
This change does not add or alter animation beyond upstream's opt-in panel animations

maria-rcks and others added 30 commits

September 2, 2026 04:28


          feat(updates): continue active threads across server restarts (pingdo…

5b7d72a

…tgg#9167)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(mobile): prevent message and composer overlap (pingdotgg#9195)

7e9d5a7


          fix(web): preserve composer draft during worktree setup (pingdotgg#9197)

f14f41b

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(web): prevent two-digit list markers from being clipped (pingdotg…

70cd258

…g#9101)

Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>


          fix(server): discover project skills for Claude (pingdotgg#9210)

bc918e7

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


          feat(web): redesign provider editor and models list (pingdotgg#8508)

6effe0a

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


          fix(web): prevent connection rows from wrapping during removal (pingd…

6e3bac3

…otgg#8706)


          fix(pull-requests): align checkout control with author (pingdotgg#9196)

57a6660

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(release): pin patched expo-sharing version (pingdotgg#9250)

b5a09e1


          fix(ci): keep Expo Sharing patch applied (pingdotgg#9248)

aab4049


          fix(web): hide deleted providers with prototype keys (pingdotgg#8337)

2a7a449

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>


          feat(mobile): long-press file references for path and open actions (p…

9159b80

…ingdotgg#9258)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          fix(desktop): exclude opposite macOS pty prebuilds (pingdotgg#9240)

8d5b712


          feat(web): add copy path button to diff headers (pingdotgg#2403)

b57726c

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(server): subscribe before provider settings watcher (pingdotgg#9271)

f90e2f2

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


          fix(mobile): show filled filter icon on Android when filters are acti…

62c68dc

…ve (pingdotgg#9217)


          fix(chat): show single tool calls without summaries (pingdotgg#9267)

46b5c66

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(web): warn when shared settings have no target environment (pingd…

5a9b562

…otgg#9207)


          fix(web): confirm closing agent-controlled browsers (pingdotgg#9272)

28ddaf7

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          feat(desktop): browser profiles for the preview browser (pingdotgg#7254)

134d510

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>


          refactor(shared): move the node:sqlite Effect SQL client into shared (p…

ca63d42

…ingdotgg#7272)

Co-authored-by: Claude Opus 5 (1M context) <noreply@anthropic.com>


          feat(web): add opt-in panel animations (pingdotgg#8830)

91c8d47

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          feat(projects): automatically pull clean default branches (pingdotgg#…

ba3cb07

…9277)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(web): show pull request state icons in tabs (pingdotgg#9112)

1eb36b4

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          feat(providers): add context compaction across harnesses (pingdotgg#8808

535557b

)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          feat(web): add proactive panels (pingdotgg#9276)

fb93902

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>


          fix(web): unify control sizing across settings pages (pingdotgg#9281)

b59b7d0

Co-authored-by: Claude Code <noreply@anthropic.com>


          fix(web): offer browser profiles from the empty-panel launcher (pingd…

064392f

…otgg#9279)


          Revert "feat(providers): add context compaction across harnesses" (pi…

63f334b

…ngdotgg#9284)


          fix(web): show scroll-to-end as soon as the last message slips under …

c742edd

…the composer (pingdotgg#9280)

Co-authored-by: Claude Code <noreply@anthropic.com>

juliusmarminge and others added 5 commits

September 2, 2026 18:12


          chore(ci): only run check-run agents on vouched contributors (pingdot…

ef6cc0b

…gg#9298)

Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: Claude Fable 5 <noreply@anthropic.com>


          fix(web): stop remounting markdown on every activity delta (pingdotgg…

355fbd9

…#9306)

Co-authored-by: Claude Code <noreply@anthropic.com>


          sync: integrate upstream wave 1 through 355fbd9

1d09ff3

Merge the first 40 upstream commits after 14f15cf into the fork.

Fork adaptations:
- Keep Cursor on the TypeScript SDK; port auto/full-access onto SDK local options
- Keep CursorAcpSupport deleted
- Renumber upstream auto-pull and settlement-repair migrations to 50/51
- Preserve opaque .bin attachment metadata while adding inline document previews
- Keep the Windows Spectre runtime component IDs from the fork release fix
- Preserve Hermes companion UI, Night sky artwork, and provider-aware runtime modes

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>


          fix(web): restore FileIcon import after upstream attachment preview m…

1f1513c

…erge

The document-attachment preview auto-merge used FileIcon without importing
it and split the import block with module-scope constants.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>


          fix(server): retarget sqlite tests and Cursor skill probe after upstr…

65afdf6

…eam move

Upstream relocated the node:sqlite Effect client into @t3tools/shared.
Update remaining fork-only migration tests and provide FileSystem/Path
to Cursor skill discovery.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

github-actions Bot added vouch:trusted size:XXL 📱 Native Change labels

github-actions Bot commented Sep 4, 2026 •

edited

Loading

Thread transfer impact

✅ Thread transfer remains within every enforced ceiling.

ℹ️ The exact PR base did not have a successful artifact. Baseline uses the latest successful main measurement shown below.

Provider	Metric	Main baseline	This PR	Impact	PR ceiling
Codex	Total thread wire	13.1 KiB	13.2 KiB	+92 B (+0.7%)	15.1 KiB	✅
Codex	Thread snapshot wire	6.9 KiB	6.9 KiB	0 B (0.0%)	7.3 KiB	✅
Codex	Live turn WebSocket wire	6.3 KiB	6.3 KiB	+92 B (+1.4%)	7.8 KiB	✅
Codex	Live turn WebSocket decoded	54.7 KiB	55.5 KiB	+822 B (+1.5%)	66.4 KiB	✅
Codex	Live turn messages	8	8	0 (0.0%)	21	✅
Claude	Total thread wire	13.2 KiB	13.2 KiB	+79 B (+0.6%)	15.1 KiB	✅
Claude	Thread snapshot wire	6.9 KiB	6.9 KiB	−4 B (−0.1%)	7.3 KiB	✅
Claude	Live turn WebSocket wire	6.3 KiB	6.3 KiB	+83 B (+1.3%)	7.8 KiB	✅
Claude	Live turn WebSocket decoded	55.5 KiB	56.3 KiB	+840 B (+1.5%)	66.4 KiB	✅
Claude	Live turn messages	8	8	0 (0.0%)	21	✅

Baseline: b013971 · PR result: 1745499 · 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: 109.5 KiB
Claude decoded thread snapshot: 110.2 KiB

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

This was referenced Sep 4, 2026

sync: integrate upstream wave 2 through 652515a34 #263

Merged

sync: integrate upstream wave 3 (Antigravity + cookie import) #264

Merged

sync: integrate upstream wave 4 (settings reorg, usage limits, compaction) #265

Merged

sync: integrate remaining upstream commits through 09d13de43 #266

Merged

cursoragent and others added 5 commits

September 4, 2026 11:32


          fix(sync): restore attachment inline metadata and CI test expectations

18a5203

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.


          fix(web): drop unused react-hooks eslint-disable comments

3b2d5dc


          fix(sync): unblock CI after upstream merge leftovers

422f86b

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.


          fix(claude): restore prompt text after skipping duplicate dispatch bl…

4acf4a4

…ocks

Wave 1 dropped the trailing no-dispatch text push when avoiding duplicate
prompt+command blocks. Restore the else-if so literal prompts, /compact,
and ultrathink still reach the SDK.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>


          fix(claude): expect image blocks before prompt text in adapter tests

Slash-command expansion requires the final content block to be text, so
image attachments now precede the prompt. Update the attachment test to
match that order.

Co-authored-by: aaditagrawal <aaditagrawal@users.noreply.github.com>

aaditagrawal marked this pull request as ready for review

September 5, 2026 06:32

aaditagrawal commented Sep 5, 2026 •

edited

Loading

Owner Author

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

This was referenced Sep 5, 2026

sync: adopt upstream streaming and persistence performance work #267

Merged

sync: complete upstream alignment through 7a089b2b24 #268

Merged

fix(providers): reject unsupported rewind before restoring files #269

Merged

perf(cursor): retain compact turn summaries instead of SDK streams #270

Merged

refactor(web): remove unused legacy client modules #271

Merged

fix(providers): preserve custom model descriptors and restore Copilot startup #272

Merged

sync: finish upstream alignment through bc8584bf8e #273

Merged

aaditagrawal commented Sep 5, 2026 •

edited

Loading

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:42 AM UTC: @aaditagrawal merged this pull request with Graphite.

aaditagrawal merged commit 0e52e8d into main

28 checks passed

aaditagrawal mentioned this pull request

chore(release): prepare v0.0.41 #274

Merged

4 tasks

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

📱 Native Change size:XXL vouch:trusted