Repository navigation
fix(fork): merge upstream 79f1fad into patch/bots - #154
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#28070) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#28077) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ow (pingdotgg#28076) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…limits appear (pingdotgg#28090) Gemini quota buckets are now returned, and Argon weekly quota keeps its own label. Co-authored-by: whoisaldo <whois.younes@gmail.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/mobile/src/features/threads/NewTaskRouteScreen.tsx # apps/web/src/components/CommandPalette.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 79f1fad inNewTaskRouteScreen.tsxandCommandPalette.tsx.Upstream pingdotgg#26154 added pinned and archived projects. Its project pickers now start from
pickableProjectGroups, and the command palette imports the pin hooks next to the patch'sisBotProjectRowimport. In the mobile picker, I kept upstream'spickableProjectGroups(projectScopes)and applied the patch's bot-project filter to it. In the command palette, I kept both sets of imports.On a scratch stack of upstream 79f1fad with all 18 patches and this branch,
pnpm install --no-frozen-lockfile,vp run typecheck(39 of 39) andvp test runon the 31 test files the patches touch (906 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code