Skip to content

fix(fork): merge upstream 935818e into patch/draft-404-reload - #197

Merged
fireboltdude1357 merged 548 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-935818e
Nov 5, 2026
Merged

fireboltdude1357 merged 548 commits into
patch/draft-404-reloadfrom
fix/draft-404-reload-upstream-935818e

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/draft-404-reload conflicts with upstream 935818e in packages/client-runtime/src/state/threads.ts.

Upstream pingdotgg#26435 keeps older pending questions answerable. It adds hasMissingPendingQuestionCard right where the patch added its doc comment for makeEnvironmentThreadState. I kept upstream's helper and put the patch's comment after it, so the comment still sits on makeEnvironmentThreadState.

On a scratch stack of upstream 935818e with all 23 patches and the fix branches for default-machine, draft-404-reload and mobile-connection-timings, pnpm install --no-frozen-lockfile, vp run typecheck (40 of 40) and vp test run on the 47 test files the patches touch (1127 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 2, 2026 18:52
…3804)

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

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

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Exotic209093 <134711311+Exotic209093@users.noreply.github.com>
Co-authored-by: Issue triage verification <triage@localhost>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22661)

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
… limit (pingdotgg#23192)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…arent's turn (pingdotgg#29752)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…and longer fences (pingdotgg#29755)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ts or subagents (pingdotgg#29917)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… without raw provider text (pingdotgg#29877)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ect under diff.relative (pingdotgg#29879)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…in a subagent or side chat (pingdotgg#29891)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…squash-merged (pingdotgg#29919)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ointed parent run (pingdotgg#25662)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
b2bvic and others added 29 commits November 4, 2026 13:19
…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>
…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>
# Conflicts:
#	packages/client-runtime/src/state/threads.ts
@fireboltdude1357
fireboltdude1357 merged commit a3a120e into patch/draft-404-reload 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.