Skip to content

fix(fork): merge upstream 0487654 into patch/bots - #271

Merged
fireboltdude1357 merged 366 commits into
patch/botsfrom
fix/bots-upstream-0487654
Nov 14, 2026
Merged

fireboltdude1357 merged 366 commits into
patch/botsfrom
fix/bots-upstream-0487654

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 0487654 in apps/web/src/components/chat/DraftHeroHeadline.tsx.

Upstream pingdotgg#29846 makes the new-thread project picker follow the manual project order. That removes useVisibleThreadShells and its threads value from this component. The patch adds useBotProjectKeys to the same import and declares botProjects next to threads. I kept upstream's removal and added back only useBotProjectKeys and botProjects. The patch's filter, which keeps bot projects out of the picker, merged unchanged.

On a scratch stack of upstream 0487654 with all 26 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (41 of 41) and vp test run on the 49 test files the patches touch (1438 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 13, 2026 17:35
…etect (pingdotgg#31170)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#31146)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ged revalidation (pingdotgg#23775)

Signed-off-by: Shaswat Raj <shaswat340@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ell (pingdotgg#33064)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: lyn1dev <lyn1dev@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… local port (pingdotgg#24247)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#23743)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: only21mil <only21mil@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…omposer (pingdotgg#26692)

Co-authored-by: nibarAhmed <nibarahmed0@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hite (pingdotgg#34569)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#36290)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…hes (pingdotgg#36477)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…gg#36504)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Grok 4.7 <noreply@x.ai>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
saphid and others added 29 commits November 14, 2026 06:49
…dotgg#29637)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es it again (pingdotgg#29619)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#36779)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#36774)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ovider logs (pingdotgg#29641)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ses itself (pingdotgg#29654)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…every chunk (pingdotgg#29422)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ngdotgg#27458)

Co-authored-by: maximkes <22573701+maximkes@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es the refusal (pingdotgg#28360)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…28518)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… status (pingdotgg#29855)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#29628)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ead of running forever (pingdotgg#29208)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…itions (pingdotgg#29612)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… diff (pingdotgg#29629)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…der (pingdotgg#29846)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…oved (pingdotgg#29699)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es (pingdotgg#29867)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…36785)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…changes (pingdotgg#36786)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
… 09:00 (pingdotgg#36789)

Co-authored-by: Alex Southwell <4596216+saphid@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…ingdotgg#29802)

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#29395)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…-upstream-0487654

# Conflicts:
#	apps/web/src/components/chat/DraftHeroHeadline.tsx
@fireboltdude1357
fireboltdude1357 merged commit 7bf1674 into patch/bots Nov 14, 2026
4 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.