Skip to content

fix(fork): merge upstream 79f1fad into patch/bots - #154

Merged
fireboltdude1357 merged 8 commits into
patch/botsfrom
fix/bots-upstream-79f1fad
Oct 31, 2026
Merged

fireboltdude1357 merged 8 commits into
patch/botsfrom
fix/bots-upstream-79f1fad

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 79f1fad in NewTaskRouteScreen.tsx and CommandPalette.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's isBotProjectRow import. In the mobile picker, I kept upstream's pickableProjectGroups(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) and vp test run on the 31 test files the patches touch (906 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

t3dotgg and others added 8 commits October 31, 2026 02:37
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
@fireboltdude1357
fireboltdude1357 merged commit f594148 into patch/bots Oct 31, 2026
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants