Repository navigation
fix(fork): merge upstream be2ea30 into patch/bots - #131
Merged
Merged
Conversation
…real load (pingdotgg#26314) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#26302) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… tunnel limit (pingdotgg#26186) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…d environment (pingdotgg#26178) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ent (pingdotgg#26318) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#25931) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#26326) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26323) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#26305) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#21039) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ed revokes (pingdotgg#26320) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… and fonts (pingdotgg#26342) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#26330) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26345) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#26343) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#26366) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26371) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…-upstream-be2ea30 # Conflicts: # apps/web/src/components/Sidebar.tsx # docs/user/thread-sidebar.md
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 02:50 run failed on 441a4eb. This branch merges upstream's current head, be2ea30.
apps/web/src/components/Sidebar.tsx: upstream's feat(web): boring sidebar groups threads into project folders pingdotgg/t3code#21039 adds a beta mode that groups active threads into project folders. It touches the same imports, state, return values and row variant as this patch's Bots shelf. I kept both. Bot threads still go to the Bots shelf before the active list, so project folders never list them. Bot rows keep the card style, and folder rows take upstream'sfoldervariant.docs/user/thread-sidebar.md: kept the Bots section and upstream's new "Group threads by project" section.Verification:
vp run typecheck: 36 of 36 tasks pass.vp test runon the 13 test files this patch adds or changes: 336 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 (672 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code