Skip to content

fix(fork): merge upstream dd8c122 into patch/cache-expiry-compaction - #189

Merged
fireboltdude1357 merged 250 commits into
patch/cache-expiry-compactionfrom
fix/cache-expiry-compaction-upstream-dd8c122
Nov 3, 2026
Merged

fireboltdude1357 merged 250 commits into
patch/cache-expiry-compactionfrom
fix/cache-expiry-compaction-upstream-dd8c122

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

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

Upstream pingdotgg#30051 shows the right context window for Claude models outside the catalog. claudeProviderTurnTokenUsage now takes maxTokens instead of the model selection, and the adapter's context-usage handler also accepts a plain token count after compaction.

  • claudeProviderTurnTokenUsage: kept the patch's body, which reads usage from the last sampling iteration and carries a known cache TTL forward, with upstream's maxTokens parameter.
  • The context-usage handler: kept upstream's handling of plain counts. For real usage, it passes context.promptCacheTtlMs and stores the TTL the result reports, as the patch did.
  • The patch's two tests of claudeProviderTurnTokenUsage now pass null for maxTokens, as upstream's own test does. Neither checks it.

On a scratch stack of upstream dd8c122 with all 23 patches and this branch, pnpm install --no-frozen-lockfile, vp run typecheck (40 of 40) and vp test run on the 47 test files the patches touch (1091 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

tris203 and others added 30 commits November 3, 2026 01:31
…er a branch rename (pingdotgg#26125)

Co-authored-by: maria-rcks <maria@kuuro.net>
…Code (pingdotgg#27438)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
… 512 characters (pingdotgg#29167)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…eeps its real remote (pingdotgg#29180)

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s into a rename (pingdotgg#29571)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…r approvals (pingdotgg#29567)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 29 commits November 3, 2026 15:36
…ingdotgg#29841)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ck out (pingdotgg#29892)

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

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

Co-authored-by: Taylor Dolezal <117500+onlydole@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…one (pingdotgg#29872)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…o the old status (pingdotgg#29894)

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

Co-authored-by: Taylor Dolezal <117500+onlydole@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…e advancing the clock (pingdotgg#30463)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…e new version (pingdotgg#29901)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…r page open (pingdotgg#29885)

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

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

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

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

Co-authored-by: maria-rcks <maria@kuuro.net>
…point (pingdotgg#30033)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 38a5f40 into patch/cache-expiry-compaction Nov 3, 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.