Skip to content

sync: integrate remaining upstream commits through 09d13de43 - #266

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

sync: integrate remaining upstream commits through 09d13de43#266
aaditagrawal merged 35 commits into
mainfrom
codex/sync-upstream-20260904-wave-5-bb46

Conversation

@aaditagrawal

@aaditagrawal aaditagrawal commented Sep 4, 2026

Copy link
Copy Markdown
Owner

What changed

Integrates the remaining 30 upstream commits (161–190) through 09d13de43, stacked on #265.

After this lands, git rev-list --count HEAD..upstream/main is 0. The fork is fully up to date with read-only upstream pingdotgg/t3code.

Included upstream work

  • Compact composer context meter, resting-composer last-message visibility
  • Usage provider controls moved to settings
  • OpenCode workspace skills via SDK (avoid 64KB CLI pipe truncation)
  • Antigravity subagent batches stay active after launch
  • PR refresh after thread turns; draft PRs render gray
  • Mobile: Android selectable chat text; workspace images in markdown previews
  • Connect/desktop/web polish (sidebar, command palette, snooze menu, panel titlebar)

Fork adaptations

  • Cursor stays on the TypeScript SDK (upstream ACP rewrite not taken)
  • Grok stays a Standard ACP wrapper; wave-5 runtime context (<runtime_info> on session/prompt) is shared through StandardAcpAdapter
  • Keep fork PR RPC tag/capability split plus upstream turn-refresh
  • All fork drivers remain registered (16 including Antigravity)

Follow-up on this stack

Pushed CI fixes across #262#266: inline attachment metadata, promptless skillDispatchInput test expectation, vp check formatting, and a mobile expo-image mock.

Stack

  1. sync: integrate upstream wave 1 through 355fbd96d #262 wave 1 → main
  2. sync: integrate upstream wave 2 through 652515a34 #263 wave 2 → wave 1
  3. sync: integrate upstream wave 3 (Antigravity + cookie import) #264 wave 3 → wave 2
  4. sync: integrate upstream wave 4 (settings reorg, usage limits, compaction) #265 wave 4 → wave 3
  5. This PR → wave 4

Verification

  • vp run typecheck passed on this branch
  • vp check passed on this branch after formatter cleanup
  • Do not merge until review comments on this stack are addressed
  • All GitHub operations are fork-only (aaditagrawal/t3code)
Open in Web Open in Cursor 

t3dotgg and others added 30 commits September 3, 2026 19:36
…ands (pingdotgg#9553)

Scrolling a long thread to the end with the composer at rest landed flush
against the short composer. The expansion that followed then covered the
last rows, because the timeline reserves only the live overlay height and
does not move for footer growth.

The timeline now keeps the expanded composer's height clear while the
composer rests, so expanding it again changes nothing above the composer.
The composer reports its resting flag from a layout effect and publishes a
fresh overlay height whenever that flag changes, so the reservation is
always computed from a height that belongs to the same layout.

Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…otgg#9562)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…9582)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Code <noreply@anthropic.com>
…9622)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ngdotgg#9623)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: shivam <91240327+shivamhwp@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
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.
@github-actions

github-actions Bot commented Sep 4, 2026

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.8 KiB 15.1 KiB
Claude Thread snapshot wire 7.0 KiB 7.3 KiB
Claude Live turn WebSocket wire 6.7 KiB 7.8 KiB
Claude Live turn WebSocket decoded 59.3 KiB 66.4 KiB
Claude Live turn messages 10 21

Baseline: unavailable · PR result: 4ee6652 · 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.

cursoragent and others added 3 commits September 4, 2026 11:43
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.
…e-4-bb46' into codex/sync-upstream-20260904-wave-5-bb46

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

aaditagrawal commented Sep 5, 2026

Copy link
Copy Markdown
Owner Author

Merge activity

@aaditagrawal
aaditagrawal changed the base branch from codex/sync-upstream-20260904-wave-4-bb46 to main September 5, 2026 07:45
@aaditagrawal
aaditagrawal merged commit 02a806b into main Sep 5, 2026
36 of 51 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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

Development

Successfully merging this pull request may close these issues.