Skip to content

fix(fork): merge upstream 5211acf into patch/timeline-index-reuse - #133

Merged
fireboltdude1357 merged 260 commits into
patch/timeline-index-reusefrom
fix/timeline-index-reuse-upstream-5211acf
Oct 28, 2026
Merged

fireboltdude1357 merged 260 commits into
patch/timeline-index-reusefrom
fix/timeline-index-reuse-upstream-5211acf

Conversation

@fireboltdude1357

Copy link
Copy Markdown
Owner

The fork's nightly build fails because this patch conflicts with upstream. The 06:50 run failed on bd84b17. This branch merges upstream's current head, 5211acf.

  • apps/server/src/orchestration-v2/ProjectionStore.ts: upstream's fix(server): load long thread history in bounded pages pingdotgg/t3code#26240 widened the timeline index row and added an includePersistentOutput flag to readTimelineIndex. I kept both and re-applied this patch's index cache with its threadIds field. The cache key now includes the flag, so work-mode and chat-mode pages never share an index.
  • apps/server/src/orchestration-v2/ProjectionStore.test.ts: fix(server): load long thread history in bounded pages pingdotgg/t3code#26240 added raw row edits to the SQL window test. The cached index waits for a thread event, so each edit batch now commits one, as this patch's earlier test commit does. Without them the test read a stale page: expected { …(3) } to equal undefined.

Verification:

  • vp run typecheck: 36 of 36 tasks pass.
  • vp test run src/orchestration-v2/ProjectionStore.test.ts in apps/server: 44 passed.
  • In a scratch worktree detached at 5211acf, all fourteen patches in .github/fork-patches.txt merge with no conflicts, using the bots and timeline-index-reuse fix branches. On the result, the build's repo-wide vp run typecheck passes all 36 tasks, and the 23 test files the patches add or change pass (673 tests).

Made by Claude Opus 5.5 in Claude Code.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 26, 2026 19:07
…ush (pingdotgg#25713)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <51714798+juliusmarminge@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… reconnect (pingdotgg#25712)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s refetch by construction (pingdotgg#25732)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…idget stops re-rendering on every presentation change (pingdotgg#25740)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… pickers drop timer and sync effects (pingdotgg#25733)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…utton's focus ring and tooltip (pingdotgg#25774)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…s send Max Mode (pingdotgg#21074)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…e charts (pingdotgg#25776)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 29 commits October 28, 2026 00:56
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…#26371)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…#26375)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rom custom snooze (pingdotgg#26427)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…o collapsed state (pingdotgg#25869)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… new links in settings (pingdotgg#26434)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ws only dead models (pingdotgg#26448)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…line-index-reuse-upstream-5211acf

# Conflicts:
#	apps/server/src/orchestration-v2/ProjectionStore.ts
Upstream pingdotgg#26240 added raw row edits to the SQL window test. The cached
timeline index waits for a thread event, so each edit batch commits one,
as the patch's earlier test commit does.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@fireboltdude1357
fireboltdude1357 merged commit d6165e9 into patch/timeline-index-reuse Oct 28, 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.