Skip to content

fix(fork): merge upstream e9e934b into patch/bots - #249

Merged
fireboltdude1357 merged 190 commits into
patch/botsfrom
fix/bots-upstream-e9e934b
Nov 12, 2026
Merged

fireboltdude1357 merged 190 commits into
patch/botsfrom
fix/bots-upstream-e9e934b

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/bots conflicts with upstream e9e934b in apps/server/src/ws.test.ts.

Upstream pingdotgg#34870 adds linked-environment threads to the shell trim test, which raises its older-settled count from 1 to 2. The patch adds botCount: 0 to that same expectation. The expectation is now count: 2, botCount: 0.

On a scratch stack of upstream e9e934b with all 26 patches and the three fix branches for this upstream, pnpm install --no-frozen-lockfile, vp run typecheck, and vp test run on the test files the patches touch plus ws.test.ts all pass (49 files, 1346 tests). integration/transferBudgetV2.integration.test.ts passes too.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 11, 2026 17:58
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
…gdotgg#33124)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…iled X (pingdotgg#34734)

Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…hread that sent them (pingdotgg#34721)

Co-authored-by: Happy Campr <happycampr@Locals-MacBook-Pro.local>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…otgg#34773)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
juliusmarminge and others added 29 commits November 12, 2026 02:59
…otgg#35170)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
… always defaults to true (pingdotgg#34950)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nd items (pingdotgg#35167)

Replaces pingdotgg#34747, pingdotgg#31828, pingdotgg#34666 and pingdotgg#27975.

Co-authored-by: Bogdan <bogdan@bowd.io>
Co-authored-by: Michael Zhou <joei4cm@gmail.com>
Co-authored-by: Pyseph <45090858+Pyseph@users.noreply.github.com>
Co-authored-by: Braulio Oliveira <brauliobo@gmail.com>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…otgg#35202)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… trimmed shell snapshots (pingdotgg#34870)

Fixes pingdotgg#30320.

Co-authored-by: Theo Browne <me@theo.li>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…s reads about half as much (pingdotgg#35178)

Refs pingdotgg#29468.

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…t on startup (pingdotgg#34596)

Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…and name (pingdotgg#34697)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…PR comment shows every row (pingdotgg#35225)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…on its history read (pingdotgg#35180)

Replaces pingdotgg#34641. Refs pingdotgg#29468.

Co-authored-by: Braulio Oliveira <brauliobo@gmail.com>
Co-authored-by: Theo Browne <me@theo.li>
Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…-upstream-e9e934b

# Conflicts:
#	apps/server/src/ws.test.ts
@fireboltdude1357
fireboltdude1357 merged commit 2a04a5b into patch/bots Nov 12, 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.