Skip to content

fix(fork): merge upstream bb646d2 into patch/cache-expiry-compaction - #245

Merged
fireboltdude1357 merged 129 commits into
patch/cache-expiry-compactionfrom
fix/cache-expiry-compaction-upstream-bb646d2
Nov 12, 2026
Merged

fireboltdude1357 merged 129 commits into
patch/cache-expiry-compactionfrom
fix/cache-expiry-compaction-upstream-bb646d2

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/cache-expiry-compaction conflicts with upstream bb646d2 in apps/server/src/orchestration-v2/Orchestrator.ts.

Upstream pingdotgg#28980 adds a steerFollowUpOfRunId guard at the top of dispatchMessage, 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, and vp test run on the 48 test files the patches touch (1329 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 11, 2026 15:32
…ly (pingdotgg#34524)

Co-authored-by: Kayzel <me@kayzel.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
juliusmarminge and others added 29 commits November 11, 2026 17:36
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
fireboltdude1357 merged commit db9b063 into patch/cache-expiry-compaction 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.