Repository navigation
chore(coil): merge upstream/main 680152e27b (166 commits) - #191
Merged
Merged
Conversation
…ter (pingdotgg#19964) (pingdotgg#22395) Co-authored-by: Julius Marminge <julius@marminge.se>
…tgg#22253) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t fields (pingdotgg#22203) Co-authored-by: Claude Code <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22187) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22390) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22427) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ap (pingdotgg#22408) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#20812) Co-authored-by: Pixel Perfect <me@pixp.cc> Co-authored-by: Theo Browne <me@t3.gg> Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…erShell (pingdotgg#22494) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22521) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ction (pingdotgg#22526) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tes (pingdotgg#22524) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22533) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22523) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#22764) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22607) Co-authored-by: ishaanko <ishaanko.mail@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22767) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rt (pingdotgg#22784) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22780) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er it (pingdotgg#22783) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22787) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… setting (pingdotgg#22841) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nstall (pingdotgg#22855) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#21872) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
….7 to 17.10 answer (pingdotgg#21909)
…s AGENTS.md (pingdotgg#22848) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… shell (pingdotgg#22856) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t found" (pingdotgg#22850) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t for 3 minutes (pingdotgg#22903) On desktop, an abandoned browser sign-in blocked every T3 Connect sign-in for 3 minutes. A new attempt now replaces the stale Clerk flow, and a Cancel bar resets the sheet. Takeover of pingdotgg#22708. Co-authored-by: steve-ai-vibe <steve.ai.vibe@gmail.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…character catalog dump (pingdotgg#22889) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # .github/workflows/ci.yml # .github/workflows/release-desktop.yml # .github/workflows/release.yml # .github/workflows/web-preview.yml # apps/desktop/src/preload.ts # apps/server/src/sourceControl/SourceControlRepositoryService.test.ts # pnpm-lock.yaml # scripts/notify-discord-release.test.ts
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.
What changed for you
83 user-facing changes from upstream T3 Code, out of 166 upstream commits. Tests, CI, refactors and docs are left out. Compare the full range.
New
Fixed and improved
Reverted
#19964) (#22395)Other
What I resolved
The daily sync (run 39606718723, #190) stopped on conflicts. Merged the latest
upstream/main(680152e) instead of the run's e822ba7.apps/desktop/src/preload.ts: kept both sides. Upstream's new Clerk OAuth cancel bridge sits next to the fork'scoilUpdatebridge.apps/server/src/sourceControl/SourceControlRepositoryService.test.ts: kept the fork's six clone-failure tests (from 40b271d), and dropped the two upstream tests upstream pruned in test: delete 11k low-signal tests so CI runs faster and flakes less pingdotgg/t3code#22557/test(server): prune low-value tests in apps/server (second pass) pingdotgg/t3code#22592.pnpm-lock.yaml: took upstream's lockfile and re-ran the install with pnpm 12.14.0, which upstream now pins. The re-resolve keeps the fork's packages and security pins..github/workflows/{ci,release,release-desktop,web-preview}.ymlandscripts/notify-discord-release.test.ts: kept deleted, as the fork retires them.Seam review: upstream's changes to fork-touched files (
packages/contracts/src/ipc.ts,settings.ts,scripts/build-desktop-artifact.ts, the pruned tests) merged cleanly and don't change APIs the fork hooks into.apps/marketingchanges were typecheck-cache tweaks only; nothing worth porting toapps/coil-home.Local: typecheck and lint green; the resolved test file passes.
coil-ciis the gate for the full suite.Opus 5.5 via Claude Code.
🤖 Generated with Claude Code