Repository navigation
fix(fork): merge upstream bb646d2 into patch/cache-expiry-compaction - #245
Merged
fireboltdude1357 merged 129 commits intoNov 12, 2026
Conversation
…ly (pingdotgg#34524) Co-authored-by: Kayzel <me@kayzel.com> Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
…t model is hidden (pingdotgg#23615)
… wakes the parent (pingdotgg#26776)
…stead of focusing its composer (pingdotgg#27287)
…date that can't run (pingdotgg#27706)
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>
…e-expiry-compaction-upstream-bb646d2 # Conflicts: # apps/server/src/orchestration-v2/Orchestrator.ts
fireboltdude1357
merged commit Nov 12, 2026
db9b063
into
patch/cache-expiry-compaction
2 checks passed
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The fork's nightly build fails because
patch/cache-expiry-compactionconflicts with upstream bb646d2 inapps/server/src/orchestration-v2/Orchestrator.ts.Upstream pingdotgg#28980 adds a
steerFollowUpOfRunIdguard at the top ofdispatchMessage, just before the stale-question-wake check. The patch's combined check sits in the same spot: a stale question wake or a stale cache-expiry compaction is accepted without changes, a fix from #232. I kept upstream's new guard and put the patch's combined check back right after it.On a scratch stack of upstream bb646d2 with all 26 patches and this branch,
pnpm install --no-frozen-lockfile,vp run typecheck, andvp test runon the 48 test files the patches touch (1329 tests) all pass.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code