sync(upstream): merge upstream/main 064041072 into fork/dev

[omegent-app]

Adopts upstream through 064041072 — the thirteen commits after #379, headlined by
pingdotgg#5672 making sidebar v2 the default.

Important

Merge with a merge commit, not squash. Squashing collapses the second parent and discards
upstream's commits as ancestors — the thing that keeps "commits behind upstream" honest.

Upstream commits entering the product

Commit
064041072	fix(desktop): zoom shortcuts no longer die when the preview browser has focus (pingdotgg#5691)
2c7267ad4	fix(server): stop the reaper from silently killing live background subagents (pingdotgg#5677)
daf8ee0b2	fix(web): inherit terminal size in simple typography (pingdotgg#5628)
ed886fe18	fix(web): delay transient reconnect warnings (pingdotgg#5670)
4eaf5ef8b	fix(server): stop PR status lookups amplifying GitHub rate limits (pingdotgg#5673)
0de954073	feat: sidebar v2 is now the default sidebar (pingdotgg#5672)
31891a1a0	feat(web): fold plan mode and token-by-token output into Legacy features (pingdotgg#5664)
45d9aa90b	fix(web): show Stop button while input is pending (pingdotgg#5554)
7a84f6cf1	fix(web): reconnect the composer seam for remote non-Git projects (pingdotgg#5633)
f0fb406ac	feat(web): make sidebar artwork theme-aware (pingdotgg#5636)
72d673a85	feat(desktop): remember recently used sites in the Browser panel (pingdotgg#5270)
82406bce9, e2cd2383c	chore: vouch contributors

The hard part: a rename git could not follow

pingdotgg#5672 is a file-level restructure — upstream renamed the classic sidebar to
LegacySidebar.tsx, moved SidebarV2.tsx's content into Sidebar.tsx, and deleted
SidebarV2.tsx. Because this fork had heavily modified both files, git saw a
modify/delete pair and gave up on rename detection, leaving 23 conflict hunks in the wrong file.

Each was therefore merged three-way by hand, against the merge-base:

Result	= fork content	+ upstream delta
Sidebar.tsx	the fork's SidebarV2.tsx (multi-env + ownership filters, identity marks, budgeted listStatus, pin ordering, copy-thread-id, unread + regenerating-title chrome, settled shelves)	pingdotgg#5672's rename sweep — SidebarV2*→Sidebar*, group/v2-row→group/sidebar-row, sidebar-v2-* test ids — plus aria-busy on rows
LegacySidebar.tsx	the fork's old Sidebar.tsx	upstream's rename + settings-nav hoist

AppSidebarLayout now renders SettingsSidebarNav for both sidebars, so neither renders it
itself — verified there is exactly one mount on the settings route and none elsewhere.

forkSurfaceExistence — the fork's anti-stack-drop net — was retargeted, not relaxed. All 17
assertions still run against the renamed files and ids, and they are what caught my first attempt
shipping upstream's v1 as LegacySidebar.tsx instead of the fork's (which would have silently
dropped the settled-shelf chrome, composer draft marks and provider usage dots from the legacy
sidebar).

Other resolutions

Where	Situation	Resolution
GitManager	pingdotgg#5673 replaces the flat 20s failure TTL with per-branch exponential backoff, because a rate-limited poller was re-asking faster than a healthy one	upstream's backoff adopted; the fork's terminal-state PR freeze kept alongside it
ComposerPrimaryActions	pingdotgg#5554 shows Stop while input is pending — precisely what the fork's shouldShowComposerInterruptAction suppressed	upstream's behaviour adopted; the superseded predicate and its tests retired, not merged
PreviewView	the fork's resolveNavigableUrl asks the environment about tailnet routing; upstream adds browser history (pingdotgg#5270)	fork resolution kept, history recorded only on successful navigation
settings keys	sidebarV2Enabled/sidebarV2ConfiguredByUser → legacySidebarEnabled; enableAssistantStreaming → enableLegacyTokenStreaming; mobile threadListV2Enabled → legacyThreadListEnabled. All are deliberately fresh keys so decoding drops the old ones and prior opt-ins reset	adopted; consumers migrated to the new resolvers
.github/VOUCHED.td	upstream's contributor-vouching file, deleted by this fork	deletion kept

Adversarial review

grok-4.5 reported the sidebar hand-merge, settings migrations, settings-nav hoist, GitManager,
composer, preview and forkSurfaceExistence all clean — and found one HIGH:

Finding	Disposition
HIGH — the mobile ThreadNavigationSidebar still gated v2 on the retired threadListV2Enabled. I migrated HomeScreen but missed this one, so the iPad/split list would have stayed on the legacy layout with no setting able to change it, disagreeing with Home	Fixed. It now reads through resolveThreadListV2Enabled exactly like HomeScreen

Verification

• Full recursive typecheck clean across 17 packages.
• 2,288 tests pass; the only failure is the pre-existing CodexTextGeneration launch-args one,
  which reproduces on unmerged fork/dev.

Note

#376 (PR-badge fallback for prNNNN checkouts) touches findLatestPrForHeadContext in
GitManager.ts, which pingdotgg#5673 also rewrites. It will need a rebase after this lands.

Co-authored by @patroza

opened by Patrick Roza in chat thread Discord · Discord · T3