Skip to content

sync: record upstream/main ancestry for 2026-07-30 - #196

Merged
aaditagrawal merged 104 commits into
mainfrom
sync/20260730-l7-ancestry
Aug 1, 2026
Merged

sync: record upstream/main ancestry for 2026-07-30#196
aaditagrawal merged 104 commits into
mainfrom
sync/20260730-l7-ancestry

Conversation

@aaditagrawal

Copy link
Copy Markdown
Owner

Top of the 2026-07-30 upstream sync stack (L7/7). Stacked on #195.

Records upstream/main @ 4ba4871a as a second parent via git merge -s ours, so future syncs diff from this point instead of replaying the 101 commits already ported in #190#195. The tree is unchangedgit diff HEAD^1 HEAD is empty, matching the pattern of the previous ancestry merge (873919b).

Coverage

101 of 103 upstream commits since 5719e8ac are ported. The two skipped commits touch only fork-protected files:

  • #4782 — docs: overhaul agent guidance (AGENTS.md, README.md only)
  • #4949 — docs: seed worktrees with real userdata (AGENTS.md only)

Their docs/ and infra/ content arrives via #4807 in #195.

Verification

vp run typecheck and vp check pass on the merge commit; full server, web, client-runtime, shared, contracts and scripts suites green.

t3dotgg and others added 30 commits July 26, 2026 15:26
…ingdotgg#4555)

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

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

Co-authored-by: codex <codex@users.noreply.github.com>
…queue (pingdotgg#4453)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Prepare Relay production infrastructure for the PlanetScale PS_20 HA topology, upgrade Effect and Alchemy to compatible betas, reconcile migration state, and preserve patched MCP session termination behavior.\n\nCo-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…ts down (pingdotgg#4531)

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…tgg#4670)

Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
t3dotgg and others added 18 commits July 30, 2026 09:29
…it (pingdotgg#4949)

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

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

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

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

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: codex <codex@users.noreply.github.com>
@coderabbitai

coderabbitai Bot commented Jul 31, 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: 7ae38f4b-2f01-4f0d-814e-f55a2dc678e0

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 Jul 31, 2026
@aaditagrawal

Copy link
Copy Markdown
Owner Author

@coderabbitai review

@coderabbitai

coderabbitai Bot commented Jul 31, 2026

Copy link
Copy Markdown
✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

Merge upstream/main @ 4ba4871 after the Jul 30 port stack (L1-L6).
Conflicts keep the fork's Cursor SDK driver and manual-only maintenance,
subscribeDomainEvents + latestSequence on the ws live path, the fork
migration registry (upstream 035 appended as ID 38), provider-scoped
runtime modes, Tailscale serve wiring, the Copilot CLI asar unpack, and
the protected AGENTS.md / README.md policies.

Skipped upstream-only doc rewrites that touch just AGENTS.md/README.md
(pingdotgg#4782, pingdotgg#4949); their docs/ and infra/ content is ported via pingdotgg#4807.
@aaditagrawal
aaditagrawal force-pushed the sync/20260730-l6-search-diagnostics branch from b75a4d4 to 1b79641 Compare August 1, 2026 07:11
@aaditagrawal
aaditagrawal force-pushed the sync/20260730-l7-ancestry branch from 6045dec to a8c7473 Compare August 1, 2026 07:11
@aaditagrawal
aaditagrawal changed the base branch from sync/20260730-l6-search-diagnostics to main August 1, 2026 07:19
@aaditagrawal
aaditagrawal merged commit 88f10a3 into main Aug 1, 2026
12 checks passed
@aaditagrawal
aaditagrawal deleted the sync/20260730-l7-ancestry branch August 1, 2026 19:06
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.