Repository navigation
chore(coil): merge upstream/main 6524a8d437 (406 commits) - #169
Merged
Merged
Conversation
…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>
…ingdotgg#17496) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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>
…ngdotgg#17746) 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>
…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>
…ingdotgg#18878) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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>
…gdotgg#18709) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 to58d253231don 2026-10-12, then the 35 that landed upstream since.Land with a merge commit, never squash:
Conflicts
All in the first merge. The second pass (35 commits) merged clean.
mobile-eas-preview.yml,mobile-eas-production.yml,release-desktop.yml): modify/delete, kept deleted per the sync script's policy.SourceControlRepositoryService.ts: upstream refactor(contracts): source control provider kind is an open branded slug pingdotgg/t3code#17739 madeSourceControlProviderKindan open branded slug and rewrote each"unknown"literal on the lines the fork changes to carry the provider derived from the remote URL (Cloning from Bitbucket fails with an undiagnosable error: "cloneRepository failed for unknown: The source control operation could not be completed" #98). All seven hunks keep the fork's derivedprovider;resolveCloneProvidernow mints the brand, andBitbucketApicomes from upstream's new package.pnpm-lock.yaml: seeded from upstream's and re-resolved. The delta is the fork's own importers and security-override pins.Follow-up commits
fix(coil): upstream moved source control into@t3tools/source-control-*packages. Fork-ownedcloneDiagnostics.tsandSourceControlProviderDiscovery.test.tsstill 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 at6524a8d437. The second pass moved no seam, so the totals are unchanged.Seam review
Every fork edit in an upstream-touched seam is intact.
SourceControlProviderDiscovery.tswas renamed topackages/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 toapps/coil-home.Second pass: upstream touched three files the fork also edits.
DesktopPreReadyPlatform.test.tskeeps the fork'sT3 Coil (Alpha)assertion,pnpm-workspace.yamltakes upstream'sallowBuildsbump beside the fork's override pins, andpnpm-lock.yamlinstalls with--frozen-lockfile. No marketing commits.Verification
Run locally on macOS arm64 under Node 24:
vp run typecheck: greenvp run lint: greenapps/mobilehas 2 failing macOS-only Swift tests (notification-center-manager.test.ts,permissions-service.test.ts). They compile upstream's native sources with the hostswiftc(Swift 6.4 / macOS 27 here), the fork is byte-identical to upstream inapps/mobile/scriptsandpatches/, and they do not run on the Linux CI runners. Not investigated further;coil-ci.ymlis 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