Skip to content

fix(fork): merge upstream becf853 into patch/cache-expiry-compaction - #113

Merged
fireboltdude1357 merged 10 commits into
patch/cache-expiry-compactionfrom
fix/cache-compaction-upstream-becf853
Oct 27, 2026
Merged

fireboltdude1357 merged 10 commits into
patch/cache-expiry-compactionfrom
fix/cache-compaction-upstream-becf853

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because this patch conflicts with upstream commit becf853.

Upstream's pingdotgg#25686 renamed SettingsThreadsRouteScreen.tsx to ThreadSettingsSections.tsx. It also moved that screen's settings writes to the Threads page, whose write() saves one patch to every selected target. Git carried this patch's "Compact before cache expires" switch into the new file. Only the write function conflicted.

  • apps/mobile/src/features/settings/ThreadSettingsSections.tsx: I took upstream's writeToAll, which calls props.write. The patch's version could write to a chosen subset of targets. When the switch was turned on, it wrote only to targets that were off, so each environment kept its own minimum. That's no longer possible, so turning the switch on now writes a minimum that one of the targets already has, or 150k if none has one. Turning it off still writes null to every target.

Verification:

  • vp run typecheck in apps/mobile: 0 errors.
  • In a scratch worktree detached at becf853, all nine patches in .github/fork-patches.txt merge with no conflicts, using this branch and fix(fork): merge upstream becf853 into patch/release #112's release fix. On the result, the build's repo-wide vp run typecheck passes all 35 tasks, and the 17 test files the patches add or change pass (580 tests).
  • Not checked on a device.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 10 commits October 26, 2026 16:58
…ender loop (pingdotgg#25678)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… on the composer (pingdotgg#25401)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream pingdotgg#25686 moved mobile thread settings into ThreadSettingsSections,
where the page's single write() saves one patch to every target. Take that
write path. The Compact before cache expires switch now reuses a minimum a
target already has when turned on, or 150k, instead of writing only to
targets that were off.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 4326c37 into patch/cache-expiry-compaction Oct 27, 2026
1 check 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.

3 participants