Repository navigation
fix(fork): merge upstream dac8b11 into patch/bots - #136
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… of ssh (pingdotgg#25661) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26580) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…17138) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#26596) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er's edge (pingdotgg#26597) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pha) (pingdotgg#25259) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26373) Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#26571) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#26637) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#21046) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#26642) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26639) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t the terminal (pingdotgg#26647) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… 0.3 ms (pingdotgg#26727) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…a new draft (pingdotgg#26565) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…checks tokens, and lists the pool through worker reconnects (pingdotgg#26706) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…filter (pingdotgg#26730) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ong threads (pingdotgg#26739) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…f usage (pingdotgg#26164) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…6779) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…its usage limit (pingdotgg#26234) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#24937) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#26522) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-upstream-dac8b11 # Conflicts: # apps/server/src/mcp/toolkits/project/handlers.test.ts # apps/web/src/components/chat/DraftHeroHeadline.tsx
Upstream pingdotgg#26164 made t3_thread_launch read providers to fall back when the default is out of usage. 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 fork's nightly build fails because this patch conflicts with upstream. The 22:50 run failed on fe219c4. This branch merges upstream's current head, dac8b11.
apps/web/src/components/chat/DraftHeroHeadline.tsxandapps/server/src/mcp/toolkits/project/handlers.test.ts: upstream's feat(server,web,mobile): fall back when the default provider is out of usage pingdotgg/t3code#26164, which falls back when the default provider is out of usage, changed the same import lists. Each file keeps both sets of imports.handlers.test.tsnow provides an emptyProviderRegistrymock, because feat(server,web,mobile): fall back when the default provider is out of usage pingdotgg/t3code#26164 makest3_thread_launchread providers.Verification:
vp run typecheck: 36 of 36 tasks pass.vp test runon the 13 test files this patch adds or changes: 338 passed..github/fork-patches.txtmerge with no conflicts, using this fix branch. On the result, the build's repo-widevp run typecheckpasses all 36 tasks, and the 23 test files the patches add or change pass (681 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code