Repository navigation
fix(fork): merge upstream 955e2bf into patch/bots - #157
Merged
Merged
Conversation
…22442) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28162) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28409) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#28446) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ery (pingdotgg#14519) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com>
…ingdotgg#15000) Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#21527) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#21913) Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ntents (pingdotgg#22302) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…#23230) Co-authored-by: maria-rcks <maria@kuuro.net>
…gdotgg#23414) Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: maria-rcks <maria@kuuro.net>
… runs on (pingdotgg#24833) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
… on (pingdotgg#24898) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…sts (pingdotgg#25836) Co-authored-by: maria-rcks <maria@kuuro.net>
… Working shelf (pingdotgg#26195) Co-authored-by: SAPHID <saphid@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#26247) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…26666) Co-authored-by: maria-rcks <maria@kuuro.net>
…gg#27032) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27268) Co-authored-by: maria-rcks <maria@kuuro.net>
…dotgg#27310) Co-authored-by: maria-rcks <maria@kuuro.net>
…T3 runs (pingdotgg#28064) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…op (pingdotgg#28072) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…witches threads (pingdotgg#28091) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…tgg#28132) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…_capabilities reports (pingdotgg#28133) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28169) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ironment disabled (pingdotgg#28179) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…nks (pingdotgg#28189) Co-authored-by: MarcoDotIO <20867620+MarcoDotIO@users.noreply.github.com>
…otgg#28209) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#28240) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28243) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <maria@kuuro.net>
…ngdotgg#28267) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#28268) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he app unreleased (pingdotgg#28269) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rver test that reads it (pingdotgg#28273) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#28274) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#28276) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tifications guide (pingdotgg#28310) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#28515) Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/web/src/components/Sidebar.tsx
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
patch/botsconflicts with upstream 955e2bf inSidebar.tsx.Upstream pingdotgg#26195 moved the Working shelf check into
belongsInSidebarWorkingShelf, so threads on an unreachable environment stay out of it. The patch sends bot threads to the Bots shelf first. I kept upstream's helper and put the patch's bot check in front of it.On a scratch stack of upstream 955e2bf with all 18 patches and the fix branches for bots, timeline-index-reuse and draft-404-reload,
pnpm install --no-frozen-lockfile,vp run typecheck(39 of 39) andvp test runon the 31 test files the patches touch (940 tests, includingProjectionStore.test.ts,Sidebar.logic.test.tsandthreads-sync.test.ts) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code