You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
chore(v2): merge main into the V2 branch (second batch, 18 commits)
Merges origin/main (95030dc), the 18 commits after a21b42c.
Conflict resolutions that change V2 code:
- AgentAwarenessRelay: keep V2's publish worker and drain, add main's
unlinked backoff and requestCatchUp (cloud/http now wakes it). Main's
catch-up tests are rewritten against V2's relay harness.
- server.ts: keep V2's MCP route wiring, add main's untracedRequestsLayer last.
- Sidebar: V2's sortSettledThreadsForSidebar is dropped for main's shared
sortSettledThreads (client-runtime, same resolver); its tests moved there
and use V2's latestRun.
- #13767 cache encode shortcut: not taken. It relies on V1 shells being in
encoded form; V2 shells hold DateTime values and V2 already encodes
cooperatively (mobile shell-cache-encoding, #12117). Main's IndexedDB
"abort" listener fix is kept.
- #13764 queued sends: main's client-side QueuedMessageSender and
queuedMessageStore stay deleted; V2 queues runs on the server
(Orchestrator startNextQueuedRun), which already drains unopened threads.
- #13765 / #13756: V1 ProjectionSnapshotQuery and ProjectionPipeline keep
V2's versions except main's skip of empty attachment-cleanup spans.
- Docs: composer.md keeps V2's queue text; keybindings.md adds
usagePageOpen to V2's list.
- Deleted-in-V2 V1 files that main modified stay deleted.
Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
0 commit comments