Repository navigation
fix(fork): merge upstream 5b2ee39 into patch/cache-expiry-compaction - #64
Merged
fireboltdude1357 merged 37 commits intoOct 21, 2026
Conversation
pingdotgg#22570) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22557) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#22575) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22561) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…event-driven (pingdotgg#22565) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ing parent (pingdotgg#22581) Co-authored-by: syberia <n.kuhtin@gmail.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#22588) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tgg#22589) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#22591) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22592) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#22593) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…pingdotgg#22599) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#22556) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rts (pingdotgg#22602) Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
ClaudeAdapterV2.test.ts: kept upstream's pruned file and re-added the patch's four tests for the last-sampling-pass context size and the carried-forward prompt cache TTL. Dropped the steer backgrounding test. Upstream deleted it, and the patch had only pointed it at an empty CLAUDE_CONFIG_DIR. sharedSettings.test.ts: took upstream's file. Upstream deleted the shared-keys list test, and the patch had only added cacheExpiryCompactionMinTokens to that list. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fireboltdude1357
merged commit Oct 21, 2026
f68db31
into
patch/cache-expiry-compaction
1 check 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 this patch conflicts with upstream commit 5b2ee39.
Upstream's test prune (pingdotgg#22557, pingdotgg#22593 and pingdotgg#22599) cut down both test files this patch changes.
apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts: I took upstream's pruned file and re-added the patch's four tests: context size measured from the last sampling pass, as a unit test and a streamed test, and a known cache TTL carried forward without dating a cache-only read's expiry, as a unit test and an adapter test. Upstream deleted the steer backgrounding test, which the patch had only changed to use an emptyCLAUDE_CONFIG_DIR, so that change goes too.packages/client-runtime/src/state/sharedSettings.test.ts: upstream deleted the test listing the shared setting keys. The patch's only change there addedcacheExpiryCompactionMinTokensto that list, so I took upstream's file.Verification:
pnpm install --no-frozen-lockfile: done.pnpm run typecheckinapps/serverandpackages/client-runtime: 0 errors.vp test runinapps/serverforClaudeAdapterV2.test.ts,CacheExpiryCompactionWorker.test.ts,ProjectionStore.test.tsandProviderTurnControlService.test.ts: 249 passed.vp test run src/state/sharedSettings.test.tsinpackages/client-runtime: 17 passed.vp linton those test files, including upstream's new test lint rules: clean.Made by Claude Opus 5.5 in Claude Code.
🤖 Generated with Claude Code