Skip to content

chore(coil): merge upstream/main 6524a8d437 (406 commits) - #169

Merged
radroid merged 411 commits into
mainfrom
coil/sync-20261012
Oct 14, 2026
Merged

radroid merged 411 commits into
mainfrom
coil/sync-20261012

Conversation

@radroid

@radroid radroid commented Oct 12, 2026 •

Copy link
Copy Markdown
Owner

The daily sync has failed three days running (#168): first a red typecheck, then conflicts. This absorbs the 406 upstream commits up to 6524a8d437, in two merges: 371 commits up to 58d253231d on 2026-10-12, then the 35 that landed upstream since.

Land with a merge commit, never squash:

gh pr merge <n> -R radroid/t3code --merge --subject "chore(coil): merge upstream/main 6524a8d437 (406 commits)"

Conflicts

All in the first merge. The second pass (35 commits) merged clean.

Follow-up commits

  • fix(coil): upstream moved source control into @t3tools/source-control-* packages. Fork-owned cloneDiagnostics.ts and SourceControlProviderDiscovery.test.ts still imported the old in-server paths, which was the typecheck failure that opened [coil-sync] daily sync needs attention (verify-failed) #168.
  • docs(coil): seam ledger re-baselined. 65 files, +1106/-5833.
  • docs(coil): ledger repointed at 6524a8d437. The second pass moved no seam, so the totals are unchanged.

Seam review

Every fork edit in an upstream-touched seam is intact. SourceControlProviderDiscovery.ts was renamed to packages/source-control-core/src/server/discovery.ts; git followed the rename and the fork's spawn-error classification applied unchanged. Upstream did not absorb any fork feature this range, so nothing was removed. Marketing had two commits (header wordmark, user count), nothing worth porting to apps/coil-home.

Second pass: upstream touched three files the fork also edits. DesktopPreReadyPlatform.test.ts keeps the fork's T3 Coil (Alpha) assertion, pnpm-workspace.yaml takes upstream's allowBuilds bump beside the fork's override pins, and pnpm-lock.yaml installs with --frozen-lockfile. No marketing commits.

Verification

Run locally on macOS arm64 under Node 24:

  • vp run typecheck: green
  • vp run lint: green
  • Web tests: 487 files, 6795 tests passed
  • Non-web tests: 29 of 30 packages green. apps/mobile has 2 failing macOS-only Swift tests (notification-center-manager.test.ts, permissions-service.test.ts). They compile upstream's native sources with the host swiftc (Swift 6.4 / macOS 27 here), the fork is byte-identical to upstream in apps/mobile/scripts and patches/, and they do not run on the Linux CI runners. Not investigated further; coil-ci.yml is the arbiter.

Closes #168 once landed (the issue needs closing by hand).

Claude Opus 5.5 via Claude Code in T3 Code.

🤖 Generated with Claude Code

sergical and others added 30 commits October 10, 2026 06:27
…utput (pingdotgg#17376)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… again (pingdotgg#17379)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its thread (pingdotgg#17327)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a check is still going (pingdotgg#17344)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…dotgg#17223)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#17843)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#17724)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… full-access MCP grants (pingdotgg#17772)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pull request (pingdotgg#12223)

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: Julius Marminge <jmarminge@gmail.com>
Signed-off-by: Loïs Postula <lois@postu.la>
…slug (pingdotgg#17739)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…finitions (pingdotgg#17756)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tions (pingdotgg#17757)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…host resolvers (pingdotgg#17770)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ot GitHub (pingdotgg#17774)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Yash-Singh1 and others added 27 commits October 12, 2026 19:29
…page (pingdotgg#18666)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#16554)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
… you to a new draft (pingdotgg#18672)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ct (pingdotgg#18824)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…stead of crash-looping (pingdotgg#15925)

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
… resync after a downgrade (pingdotgg#15937)

Co-authored-by: Claude Sonnet 5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
… MCP servers (pingdotgg#17058)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ught (pingdotgg#18887)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…is offline (pingdotgg#18698)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…18853)

Co-authored-by: SAPHID <saphid@users.noreply.github.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
pingdotgg#18900)

Co-authored-by: Pawel Mikolajczuk <pmikolajczuk@atlassian.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Clean merge on top of the 58d2532 sync; no conflicts.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@radroid radroid changed the title chore(coil): merge upstream/main 58d253231d (371 commits) chore(coil): merge upstream/main 6524a8d437 (406 commits) Oct 13, 2026
@radroid
radroid merged commit cc15bb0 into main Oct 14, 2026
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[coil-sync] daily sync needs attention (verify-failed)