Skip to content

fix(fork): merge upstream e313a12 into patch/bots - #199

Merged
fireboltdude1357 merged 48 commits into
patch/botsfrom
fix/bots-upstream-e313a12
Nov 5, 2026
Merged

fireboltdude1357 merged 48 commits into
patch/botsfrom
fix/bots-upstream-e313a12

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

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

Upstream pingdotgg#31269 reverts pingdotgg#26195, so working threads stay in the Working shelf when their environment disconnects. The sidebar goes back to checking workingShelfEnabled and isWorking directly instead of calling belongsInSidebarWorkingShelf. The patch sends bot threads to the Bots shelf before that check. I kept upstream's reverted check and put the patch's bot check in front of it.

On a scratch stack of upstream e313a12 with all 23 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (40 of 40) and vp test run on the 47 test files the patches touch (1118 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

Yash-Singh1 and others added 30 commits November 3, 2026 22:18
Add 8 px edge padding to usage breakdown tables shared by Cost and Tokens. Align thread status text and actions to a common baseline while keeping icons centered.

Validated with check:changed, CI, usage-table before/after browser captures, and actual ThreadNow component captures at 100% and 91% CSS zoom. No behavior or calculation changes.

Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…reenContent (pingdotgg#30500)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…f chat (pingdotgg#30257)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…intSigner (pingdotgg#30529)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…bile (pingdotgg#30540)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he git-read timeout (pingdotgg#30554)

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

Co-authored-by: Victor Romo <vic@Victors-MacBook-Pro.local>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Seth Dixon <333797056+seth-dixon@users.noreply.github.com>
…ord (pingdotgg#30308)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…wser limit is full (pingdotgg#24186)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#26806)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gg#30744)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#29044)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
shivamhwp and others added 18 commits November 5, 2026 06:51
…ders (pingdotgg#24904)

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>
…0421)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Elliot Drel <elliotdrel@gmail.com>
…gg#28928)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#30704)

Co-authored-by: Maxime Cathala <84846651+mcathala@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…onnection in a loop (pingdotgg#23758)

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>
… it (pingdotgg#24946)

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>
…7935)

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>
…otgg#26464)

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>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Albert Li <albertli_042@hotmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…wake (pingdotgg#28204)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…29838)

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

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>
…ironment disconnects (pingdotgg#31269)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/web/src/components/Sidebar.tsx
@fireboltdude1357
fireboltdude1357 merged commit b74f80d into patch/bots Nov 5, 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.

6 participants