Skip to content

fix(fork): merge upstream 3808e2d into patch/bots - #274

Merged
fireboltdude1357 merged 158 commits into
patch/botsfrom
fix/bots-upstream-3808e2d
Nov 14, 2026
Merged

fireboltdude1357 merged 158 commits into
patch/botsfrom
fix/bots-upstream-3808e2d

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 3808e2d in the ../state/entities import of apps/web/src/components/CommandPalette.tsx.

Upstream pingdotgg#30428 imports useDelegatedUnderParent on the same line where the patch imports useBotProjectKeys. The import now includes both.

On a scratch stack of upstream 3808e2d 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 (1457 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

saphid and others added 30 commits November 14, 2026 07:36
…6793)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…s load or after a network blip (pingdotgg#28708)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…h the server rejects (pingdotgg#29845)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…elled queued messages (pingdotgg#29874)

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ry (pingdotgg#29809)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… run in 60 minutes" (pingdotgg#29756)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
)

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

Co-authored-by: Nathan Wong <20381195+thelogicmatrix@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…own merge request (pingdotgg#29791)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… to 3x later (pingdotgg#33550)

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

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

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

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
… not a same-named one on PATH (pingdotgg#33836)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Yash-Singh1 and others added 29 commits November 14, 2026 16:03
…ses for them (pingdotgg#36950)

Co-authored-by: 0xpolarzero <0xpolarzero@gmail.com>
…ngdotgg#22614)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…dotgg#23134)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t switches back (pingdotgg#30107)

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

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… (6.3 s → 0.21 s median) (pingdotgg#30059)

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

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

Co-authored-by: Ved Pandey <vedprakash2302@gmail.com>
…parent was delegated from (pingdotgg#30334)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…→ 20 ms median) (pingdotgg#30305)

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

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…breaks media in PR descriptions (pingdotgg#30571)

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

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