Skip to content

chore(sync): merge upstream/main 30724e2e9 into custom-v2 - #58

Merged
ziyadakl merged 141 commits into
custom-v2from
sync/upstream-2026-11-03
Nov 3, 2026
Merged

ziyadakl merged 141 commits into
custom-v2from
sync/upstream-2026-11-03

Conversation

@ziyadakl

@ziyadakl ziyadakl commented Nov 3, 2026

Copy link
Copy Markdown
Owner

Summary

Brings upstream/main 30724e2e9 (138 commits) into custom-v2, in two merges:

origin/custom-v2 91588c5a2 (speed PR #57)
├─ merge 57236a8ba   prepared merge of upstream cefb544af (121 commits), from draft #56
│    6 files / 7 hunks resolved; Fork code ported off Upstream's removed effect/Crypto
│    (ClaudeRewind, ClaudeAdapterV2, ThreadArchiveService, DesktopMirror,
│     client-runtime threadRewind, 6 Fork tests); stale recordLimit dropped
│    (AgentSessionScanner.ts); legacyClaudePromptUuid provides Digest.layerWebCrypto
│    → merged with no conflicts
└─ merge upstream/main 30724e2e9   17 newer commits, 2 conflicts

The 2 new conflicts:

 // apps/web/src/components/Sidebar.tsx  <SidebarThreadHeader>
-  searchFieldRef={headerSearchRef}        // Upstream deleted the anchor and the prop
   hasProjects={allProjects.length > 0}    // Fork (project archive)
   hasVisibleProjects={projectGroups.length > 0}
   environmentFilter={environmentFilter.headerControl}

 // apps/web/src/components/CommandPalette.tsx
-  const allThreads = useVisibleThreadShells();
+  const allThreads = useVisibleThreadShells().filter((thread) => !isSidebarHiddenThread(thread));
   const { projects, threads } = withoutArchivedProjects(allProjects, allThreads);

Upstream's side-chat filter moves onto the Fork's line, which already drops archived projects.

Evidence

  • Before: custom-v2 lacks 138 upstream commits.
    After: sync-upstream.sh check on affinity-vps: knip, vp check, typecheck, web build, release-link and native-file checks pass in 40 s. Footprint: 161 Upstream files edited, before and after.
  • Draft PROTOTYPE: real 2026-11-03 sync on the sharded CI shape (do not merge) #56 (the first merge alone) passed every CI job but the macOS lint, including the full server and mobile suites.
  • Custom Mac CLI Build on this branch: success.

Merge Danger

Door: one-way

Upstream migration 078_DropOrchestrationEventCorrelationIndex runs on first start. An older build is not guaranteed to run on the migrated database; back up statev2.sqlite before switching.

Blast Radius: every-machine

The Mac and all three Work boxes switch to this build together. Merge by fast-forward (git push origin sync/upstream-2026-11-03:custom-v2), not the merge button.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits November 2, 2026 09:54
…tates (pingdotgg#29486)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…ingdotgg#27756)

Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: maria-rcks <maria@kuuro.net>
…PR update (pingdotgg#29369)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…hile this device's sign-in loads (pingdotgg#29352)

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

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

## Problem

PR watches stopped after eight failed host reads, so a prolonged network outage prevented later CI and review updates from reaching the thread.

## Change

Keep watches active after provider failures reported as `failed`. Read detail and activity concurrently without allowing an activity failure to cancel or hide a permanent detail failure. Repeated known permanent failures still stop the watch and notify the agent; rate limits still pause reads. Non-rate-limited GitHub HTTP 403 responses and GraphQL `FORBIDDEN` responses now use a distinct `forbidden` reason so access refusals are counted instead of retried indefinitely. GraphQL error types survive the client mapping, after the existing requested-reviewer fallback.

The provider's `failed` category also includes unclassified host and decode errors. Those continue retrying at the existing two-minute cadence until the watch ends or is stopped. A fixed outage deadline would recreate the recovery failure for longer outages.

## Scope and approval

This is a focused fix for an obvious bug in existing PR watch recovery, covered by the small bug-fix exception in CONTRIBUTING.md. The changes cover watcher recovery, a GitHub failure classification needed to preserve permanent-error handling, and their regression tests. The new server-side `forbidden` reason does not change RPC contracts or add settings.

## Verification

`vp run check:changed` passed, including 154 tests across five files. Regression coverage includes a 30-minute outage followed by one CI-success notification, mixed activity/detail failures, resetting a prior failure count, and repeated forbidden reads stopping the watch. Provider tests distinguish HTTP 403 and exclusively permanent GraphQL refusals from retryable HTTP 503 and mixed or untyped GraphQL errors. The mixed-failure and GraphQL classification cases failed before their fixes. Seven focused requested-reviewer fallback/refusal tests also pass.

Model: GPT 6.1 Sol. Harness: Codex.
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…diff load (pingdotgg#27833)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: Henry Stern <6068107+hstern@users.noreply.github.com>
Co-authored-by: Ashish Patil <7754022+ash663@users.noreply.github.com>
Co-authored-by: TinBane <363069+TinBane@users.noreply.github.com>
…tgg#29680)

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…d newest usage (pingdotgg#29648)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ar again without going into focus mode (pingdotgg#26690)

Co-authored-by: nibarAhmed <nibarahmed0@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: shivam <91240327+shivamhwp@users.noreply.github.com>
…g#26833)

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

Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
…very poll (pingdotgg#29813)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…er a branch rename (pingdotgg#26125)

Co-authored-by: maria-rcks <maria@kuuro.net>
juliusmarminge and others added 25 commits November 2, 2026 19:05
… limit (pingdotgg#23192)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/server/src/auth/http.test.ts
#	apps/server/src/checkpointing/CheckpointDiffQuery.ts
#	apps/server/src/cloud/bootService.test.ts
#	apps/server/src/orchestration-v2/testkit/fixtures/shared.ts
#	apps/web/src/components/ChatView.tsx
#	packages/provider-core/src/server/failure.ts
…arent's turn (pingdotgg#29752)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…and longer fences (pingdotgg#29755)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ts or subagents (pingdotgg#29917)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… without raw provider text (pingdotgg#29877)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ect under diff.relative (pingdotgg#29879)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…in a subagent or side chat (pingdotgg#29891)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…squash-merged (pingdotgg#29919)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/Sidebar.tsx
@github-actions github-actions Bot added vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. size:XXL labels Nov 3, 2026
@ziyadakl
ziyadakl merged commit 09bc157 into custom-v2 Nov 3, 2026
48 of 50 checks passed
@ziyadakl
ziyadakl deleted the sync/upstream-2026-11-03 branch November 3, 2026 19:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:XXL vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.