Repository navigation
chore(coil): merge upstream/main 60b35a1ee0 (115 commits) - #193
Merged
Merged
Conversation
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…s junctions point to (pingdotgg#21099) Co-authored-by: sheehanmunim <80079528+sheehanmunim@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#22730) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22686) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#22546) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…verrides (pingdotgg#23037) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tton (pingdotgg#23040) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… own files (pingdotgg#23042) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…23046) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ort (pingdotgg#23048) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ake (pingdotgg#23049) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…olsBar (pingdotgg#23058) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23060) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23062) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ions (pingdotgg#23063) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tions (pingdotgg#23064) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…n useThreadLifecycle (pingdotgg#23065) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ineRewind (pingdotgg#23066) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…chmentPreviewHandoff (pingdotgg#23067) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…neBanner (pingdotgg#23068) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…useComposerSelection (pingdotgg#23069) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…stDraftThread (pingdotgg#23070) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ChatView.logic (pingdotgg#23071) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…line overlays move out (pingdotgg#23072) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…the server (pingdotgg#22897) Co-authored-by: MarMarLabs <marmar9615@icloud.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#21822) Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
… instead of crashing (pingdotgg#22471)
…gg#23052) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#23205) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…card (pingdotgg#23282) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…ingdotgg#22777) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…uests (pingdotgg#23034) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sed (pingdotgg#23170) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#23096) Co-authored-by: Vishal <vishalprashantdoshi@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Vishal Doshi <vdoshi96@users.noreply.github.com>
…ingdotgg#23361) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23106) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Nikita Maximilian Grimm <github@nikitagrimm.de> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tch (pingdotgg#23023) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Activities (pingdotgg#23327) Fixes pingdotgg#15682. Takes over pingdotgg#23035. Co-authored-by: Taylor Dolezal <onlydole@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23117) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23124) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23389) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…desktop updates (pingdotgg#23113) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23454) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23135) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… columns (pingdotgg#23502) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # .github/workflows/release-desktop.yml # apps/desktop/src/preload.ts # apps/server/src/sourceControl/SourceControlRepositoryService.ts # pnpm-lock.yaml
…e once Upstream's new HTTPS retry joins both failure messages. The fork's clone diagnostics turn both into the same sentence, so the user read it twice. 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
20 participants
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
82 user-facing changes from upstream T3 Code, out of 115 upstream commits. Tests, CI, refactors and docs are left out. Compare the full range.
New
Fixed and improved
posts.$postId.tsxor[id].tsxstay chips (#22922)Other
Resolution notes
The daily sync (run 39785366139, issue #192) stopped on four conflicts:
.github/workflows/release-desktop.yml: the fork deleted it and upstream edited it. Kept it deleted, as the daily job does for retired upstream workflows.apps/desktop/src/preload.ts: upstream removed its own Clerk sign-in cancel bridge (fix(desktop): use Clerk's upstream fix for abandoned browser sign-ins pingdotgg/t3code#23038, Clerk fixed it upstream). Took that removal and kept the fork'scoilUpdatebridge.apps/server/src/sourceControl/SourceControlRepositoryService.ts: upstream split cloning intorunCloneso it can retry over HTTPS when the SSH key is refused (fix(source-control): clones retry over HTTPS when the SSH key is refused pingdotgg/t3code#23170). Kept the fork's clone diagnostics (provider derived from the URL, plain-language failure reasons) insiderunClone, classifying against the URL actually being cloned.pnpm-lock.yaml: took upstream's and re-resolved withpnpm install.One follow-up commit: when both the SSH and HTTPS attempts fail for the same reason, the fork's diagnostics produce the same sentence twice, so the joined message now says it once ("Cloning over HTTPS instead failed the same way."). Upstream's new test was updated to the fork's wording.
Seam review: of the fork's seam files, upstream also touched
ChatView.tsx(large hook refactor; the fork no longer carries code there),contracts/src/settings.tsandcontracts/src/ipc.ts(merged cleanly, fork additions intact). Noapps/marketingchanges this cycle, so nothing to port toapps/coil-home. Nothing absorbed to remove.Local verify: typecheck and lint green; source-control server tests 87/87.
coil-ciis the gate for the full suite.🤖 Generated with Claude Code