Skip to content

fix(fork): merge upstream a21b43f into patch/timeline-index-reuse - #239

Merged
fireboltdude1357 merged 1193 commits into
patch/timeline-index-reusefrom
fix/timeline-index-reuse-upstream-a21b43f
Nov 12, 2026
Merged

fireboltdude1357 merged 1193 commits into
patch/timeline-index-reusefrom
fix/timeline-index-reuse-upstream-a21b43f

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/timeline-index-reuse conflicts with upstream a21b43f in ProjectionStore.ts and its test.

Upstream merged pingdotgg#24422, the PR this patch follows, and it ships the patch's cache and indexed newest-event check. Upstream's tests pass without the fork's three test-only fixes. I took upstream's files, so this branch now matches upstream exactly and the patch adds nothing. Removing it from .github/fork-patches.txt is a separate change.

On a scratch stack of upstream a21b43f with all 25 patches and the nine 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 the upstream tests next to the conflicted files, all pass (50 files, 1379 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 11, 2026 11:58
…is on the service PATH (pingdotgg#25870)

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

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#18588)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…t be resumed (pingdotgg#28195)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…king (pingdotgg#23648)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…after a screenshot (pingdotgg#25978)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…zes (pingdotgg#27335)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ted (pingdotgg#27595)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…restored context (pingdotgg#25911)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… step (pingdotgg#29956)

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rt (pingdotgg#34513)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
maria-rcks and others added 29 commits November 12, 2026 00:23
…erent calls (pingdotgg#34528)

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ingdotgg#34530)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…ntained command (pingdotgg#34531)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…dotgg#34532)

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…gdotgg#14875)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…nishes (pingdotgg#34431)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/orchestration-v2/ProjectionStore.test.ts
#	apps/server/src/orchestration-v2/ProjectionStore.ts
@fireboltdude1357
fireboltdude1357 merged commit 451be36 into patch/timeline-index-reuse Nov 12, 2026
4 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.