Skip to content

fix(fork): merge upstream 6f54322 into patch/pr-read-cache-lock - #203

Merged
fireboltdude1357 merged 1755 commits into
patch/pr-read-cache-lockfrom
fix/pr-read-cache-lock-upstream-6f54322
Nov 6, 2026
Merged

fireboltdude1357 merged 1755 commits into
patch/pr-read-cache-lockfrom
fix/pr-read-cache-lock-upstream-6f54322

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because patch/pr-read-cache-lock conflicts with upstream 6f54322 in apps/server/src/pullRequest/PullRequestReadCache.ts.

Upstream pingdotgg#30293 fixes part of what this patch fixes: an invalidation no longer waits for every PR read in flight. It hashes scopes to 64 lock stripes, so an invalidation still waits for reads of its own scope. The patch never makes an invalidation wait for reads. It tracks a generation per scope instead, and a read that overlapped an invalidation answers its caller but isn't cached.

The two designs can't be merged, so this keeps the patch's. I ran the patch's tests against upstream's code alone first. Upstream still makes a same-scope invalidation wait for a read in flight, and it caches a read that started while an invalidation was publishing (expected 'old' to equal 'fresh').

  • PullRequestReadCache.ts: kept the patch's generations and invalidation lock. Removed upstream's SCOPE_STRIPES, stripes, stripeOf and revisionWrites, and the stripe wrapper around get. Upstream's other changes in the file are unchanged.
  • PullRequestReadCache.test.ts: upstream's first test now invalidates another PR while a read is in flight, and that check stays. It also asserted that an invalidation of the read's own scope is still waiting. The patch changes exactly that, so I removed that one assertion. The patch's "invalidates without waiting for a read still in flight" test covers the behavior.

On a scratch stack of upstream 6f54322 with all 23 patches and the fix branches for pr-read-cache-lock and wal-pinned-writes, pnpm install --no-frozen-lockfile, vp run typecheck (40 of 40) and vp test run on the 47 test files the patches touch (1146 tests) all pass.

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 3, 2026 17:10
…0511)

Co-authored-by: Otavio Salvador <otavio@ossystems.com.br>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Preserve MCP and OpenCode image outputs so tool details show screenshots before their inputs. Highlight HTML preview input and valid JSON arguments and results across clients, while keeping native file text readable.

Sanitize CI test logs to avoid a Unicode runner crash without changing test exit codes.

Validation: all CI checks passed, 729 affected tests and the full 156-test Pi suite passed locally, web and iOS details verified.

Model: GPT 6.1 Sol. Harness: Codex.
…id (pingdotgg#26297)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tail pane always fill the width (pingdotgg#26328)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Add 8 px edge padding to usage breakdown tables shared by Cost and Tokens. Align thread status text and actions to a common baseline while keeping icons centered.

Validated with check:changed, CI, usage-table before/after browser captures, and actual ThreadNow component captures at 100% and 91% CSS zoom. No behavior or calculation changes.

Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
…reenContent (pingdotgg#30500)

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

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…he git-read timeout (pingdotgg#30554)

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

Co-authored-by: Victor Romo <vic@Victors-MacBook-Pro.local>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Seth Dixon <333797056+seth-dixon@users.noreply.github.com>
Jo2234 and others added 29 commits November 6, 2026 04:36
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
… sequences with intermediates (pingdotgg#30724)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…URLs with a query (pingdotgg#30726)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ken file chips (pingdotgg#30762)

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

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

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…dotgg#30798)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
… instead of ignored (pingdotgg#30973)

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

Co-authored-by: maria-rcks <maria@kuuro.net>
…output colours (pingdotgg#21542)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
…ingdotgg#31815)

Keep deferred settlement requests through automatic follow-up turns and retry from persisted run events, including replayed rejected commands. Preserve failed follow-ups and new user input, and guard settlement against newer runs.

Validated with 173 focused tests through check:changed, all CI checks on e1a41f6, and resolved agentic reviews.

Model: GPT 6.1 Sol. Harness: Codex in T3 Code.
# Conflicts:
#	apps/server/src/pullRequest/PullRequestReadCache.ts
Upstream's test asserted that an invalidation of the in-flight read's scope still waits. Under the patch, no invalidation waits on reads; the patch's own test covers that.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit 70609b7 into patch/pr-read-cache-lock Nov 6, 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.