Skip to content

fix(fork): merge upstream 955e2bf into patch/bots - #157

Merged
fireboltdude1357 merged 162 commits into
patch/botsfrom
fix/bots-upstream-955e2bf
Nov 1, 2026
Merged

fireboltdude1357 merged 162 commits into
patch/botsfrom
fix/bots-upstream-955e2bf

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream 955e2bf in Sidebar.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) and vp test run on the 31 test files the patches touch (940 tests, including ProjectionStore.test.ts, Sidebar.logic.test.ts and threads-sync.test.ts) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

UtkarshUsername and others added 30 commits October 31, 2026 20:17
…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>
…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>
…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>
… 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>
… 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>
jtatum and others added 29 commits November 1, 2026 02:44
…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>
…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>
…dotgg#28243)

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

Co-authored-by: Lukas Tomondy <lukas.tomondy@moonpyre.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>
…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
@fireboltdude1357
fireboltdude1357 merged commit a481581 into patch/bots Nov 1, 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.