Repository navigation
fix(fork): merge upstream 78ee8a1 into patch/event-history-retention - #258
Merged
fireboltdude1357 merged 1452 commits intoNov 12, 2026
Merged
fireboltdude1357 merged 1452 commits into
fireboltdude1357 merged 1452 commits into
Conversation
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>
…son other than refusal (pingdotgg#34782)
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#34797) Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
… offers Show all projects (pingdotgg#35426)
…s an IME candidate (pingdotgg#35468)
… hidden-thread count (pingdotgg#35499)
…ingdotgg#35502) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… an agent started (pingdotgg#35405) Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
…he terminal closes (pingdotgg#35534)
…d like an Object key (pingdotgg#35489)
…f can be added (pingdotgg#35492) Co-authored-by: ixmxvii-hash <235766220+ixmxvii-hash@users.noreply.github.com> Co-authored-by: Julius Marminge <julius0216@outlook.com>
…8ee8a1 # Conflicts: # apps/server/src/persistence/Migrations.ts
fireboltdude1357
merged commit Nov 12, 2026
4cac1ef
into
patch/event-history-retention
4 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/event-history-retentionconflicts with upstream 78ee8a1 inapps/server/src/persistence/Migrations.ts.Upstream pingdotgg#35486 now declares
sqlnear the top ofrunMigrations, where the patch's side of the hunk also declared it. I kept upstream's runner and put the patch's guard back in its old spot, after the migration loop and before the history check. The guard isCREATE TABLE IF NOT EXISTS orchestration_v2_event_retention, and it still runs only on full runs, whentoMigrationInclusiveis undefined. It runs on whichever connection applies migrations, including upstream's new migration worker. Every production caller does a full run, andprunedThroughSequenceonly reads the table after migration setup finishes. Upstream never creates or drops this table.On a scratch stack of upstream 78ee8a1 with all 26 patches and the three fix branches for this upstream,
pnpm install --no-frozen-lockfile,vp run typecheck, andvp test runon the test files the patches touch pluspersistence/Sqlite.test.tsandMigrations.test.tsall pass (51 files, 1377 tests).Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code