Skip to content

chore(sync): merge upstream product through v0.0.36 - #248

Merged
aaditagrawal merged 45 commits into
graphite-base/248from
sync/upstream-20260830-product
Aug 29, 2026
Merged

chore(sync): merge upstream product through v0.0.36#248
aaditagrawal merged 45 commits into
graphite-base/248from
sync/upstream-20260830-product

Conversation

@aaditagrawal

@aaditagrawal aaditagrawal commented Aug 29, 2026

Copy link
Copy Markdown
Owner

What changed

Merge the upstream release train through v0.0.36 on top of #247. This layer integrates the newer product and provider behavior, including Grok/ACP reliability work, while preserving the fork's richer shared ACP runtime.

The adapted shared ACP layer retains runtime modes, model metadata, approval memory, liveness monitoring, plan events, and the fork's complete built-in provider set.

Stack

  1. chore(sync): merge upstream foundations through v0.0.34 #246: foundations through v0.0.34
  2. chore(sync): merge upstream runtime through v0.0.35 #247: runtime through v0.0.35
  3. This PR: product through v0.0.36
  4. chore(sync): merge upstream main through 2026-08-30 #249: upstream head through 2026-08-30

Verification

  • node_modules/.bin/vp check
  • node_modules/.bin/vp run typecheck
  • Full repository test suite on the integrated stack: 933 files passed, 3 skipped; 9,698 tests passed, 26 skipped
  • Focused Grok and shared ACP tests
  • Integrated provider-settings QA on the completed stack

Mobile native verification is delegated to hosted CI because this machine has neither a usable Xcode installation nor an Android emulator.

t3dotgg and others added 30 commits August 26, 2026 23:57
…tgg#8358)

Co-authored-by: Dara Adedeji <daraadedeji07@gmail.com>
Co-authored-by: Ahmed Besic <ahmed-besic@users.noreply.github.com>
Co-authored-by: Michael Brown <michaeltbrown.mtb@gmail.com>
Co-authored-by: Lars Nieuwenhuis <35393046+lnieuwenhuis@users.noreply.github.com>
Co-authored-by: Guilherme Barros <gbarros1095@gmail.com>
Co-authored-by: PC <pc@localhost>
Co-authored-by: 1xpixi <157762409+1xpixi@users.noreply.github.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>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Recent scheduled nightlies have been delayed or skipped.

Move the nightly cron from minute 7 to minute 38. Keep the existing three-hour interval. This tests a different point in each three-hour window without claiming it will fix GitHub schedule delivery.

Authored by GPT-5.6 Sol with the Codex harness.
Add a mod+shift+p shortcut that pins or unpins the active thread. Ignore the shortcut during terminal focus and when the server does not support thread pinning.
Co-authored-by: codex <codex@users.noreply.github.com>
…mproving launch times (pingdotgg#5769)

Co-authored-by: Claude Opus 5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius@mac.lan>
…6011)

Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Shivam Sharma <91240327+shivamhwp@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
@coderabbitai

coderabbitai Bot commented Aug 29, 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: 9f63ef77-8d0e-4256-936d-7470179a9d3f

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.

aaditagrawal commented Aug 29, 2026

Copy link
Copy Markdown
Owner Author

@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 Aug 29, 2026
@aaditagrawal aaditagrawal changed the title fix(grok): improve skills, plans, usage, and turn reliability (#8358) chore(sync): merge upstream product through v0.0.36 Aug 29, 2026
@aaditagrawal
aaditagrawal marked this pull request as ready for review August 29, 2026 21:32
@github-actions

github-actions Bot commented Aug 29, 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 6.9 KiB 7.3 KiB
Codex Live turn WebSocket wire 6.6 KiB 7.8 KiB
Codex Live turn WebSocket decoded 57.0 KiB 66.4 KiB
Codex Live turn messages 11 21
Claude Total thread wire 13.3 KiB 15.1 KiB
Claude Thread snapshot wire 6.9 KiB 7.3 KiB
Claude Live turn WebSocket wire 6.4 KiB 7.8 KiB
Claude Live turn WebSocket decoded 56.4 KiB 66.4 KiB
Claude Live turn messages 9 21

Baseline: unavailable · PR result: 3a00d61 · 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.

@aaditagrawal
aaditagrawal force-pushed the sync/upstream-20260830-product branch from 11b9abf to 80e4395 Compare August 29, 2026 21:41
@aaditagrawal
aaditagrawal force-pushed the sync/upstream-20260830-runtime branch from 330fb9c to e29dc82 Compare August 29, 2026 21:48
@aaditagrawal
aaditagrawal force-pushed the sync/upstream-20260830-product branch from 80e4395 to 3a00d61 Compare August 29, 2026 21:48

aaditagrawal commented Aug 29, 2026

Copy link
Copy Markdown
Owner Author

Merge activity

aaditagrawal added a commit that referenced this pull request Aug 29, 2026
## What changed

Merge the upstream release train through v0.0.34 into the maintained fork. This is the foundation layer of a four-PR Graphite stack and includes the early mobile, desktop, workflow, and shared-runtime changes from the upstream range.

Conflict resolution preserves the fork's provider registry, provider management, usage monitoring, orchestration reliability, fork README, hosted runner policy, and fork-only release safeguards.

## Stack

1. This PR: foundations through v0.0.34
2. #247: runtime through v0.0.35
3. #248: product through v0.0.36
4. #249: upstream head through 2026-08-30

## Verification

- `node_modules/.bin/vp check`
- `node_modules/.bin/vp run typecheck`
- Full repository test suite on the integrated stack: 933 files passed, 3 skipped; 9,698 tests passed, 26 skipped
- Integrated isolated web QA on the completed stack

Mobile native verification is delegated to hosted CI because this machine has neither a usable Xcode installation nor an Android emulator. The native patch was also dry-run checked against the installed React Native dependency.
@aaditagrawal
aaditagrawal changed the base branch from sync/upstream-20260830-runtime to graphite-base/248 August 29, 2026 21:56
@aaditagrawal
aaditagrawal changed the base branch from graphite-base/248 to main August 29, 2026 22:04
@aaditagrawal
aaditagrawal changed the base branch from main to graphite-base/248 August 29, 2026 22:05
@aaditagrawal
aaditagrawal merged commit b46fc5b into graphite-base/248 Aug 29, 2026
31 of 45 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.