[Yarden-zamir]

🤖 Merges upstream main up to 616c426 "fix(shared): TypeScript files no longer show as videos" (135 commits). The Fork Sync run failed on 17 conflicts.

Conflicts

Server

• orchestration-v2/ShellStream.ts: took upstream's shellTrimFacts refactor; the fork's "keep settled terminal threads" rule moved into omitOlderSettledShellsWith.
• scheduledTasks/ScheduledTaskService.ts: took upstream's idle due-time hint; listDueTasks still gets the fork's project default model.
• storageCleanup.ts: kept both, upstream's deleted-worktree bookkeeping, then the fork's worktree artifact sweep.
• vcs/GitVcsDriverCore.ts: the fork's path template branch stays; the default (no template) path now uses upstream's short hashed folder name.
• provider/agentContextBudget.json: kept the fork values, re-measured mcpToolListJsonBytes (57074 → 57174).
• packages/contracts/.../clientRpcPermissions.ts: kept both, upstream's forceStopThread scope and the fork scopes.
• packages/provider-opencode/.../adapter.ts: kept upstream's serverPassword and the fork's thread credential environment.

Web

• AppSidebarLayout.tsx, sidebar/SidebarChrome.tsx: upstream added desktop back/forward buttons in the sidebar header and swipe navigation. The fork already has back/forward buttons behind the backForwardButtons setting. Upstream's header buttons now hide when that setting is on, so desktop never shows two pairs. They use the fork's ShortcutTrigger/ShortcutHint. Swipe navigation and the fork history recorder both stay.
• chat/useThreadLifecycle.tsx: took upstream's run stop items; the fork's background work details wrapper stays.
• chat/ChatHeader.tsx, hooks/useThreadActionMenu.ts, threadActionMenu.logic.ts: kept upstream's "Find in thread" next to the fork's pinned scripts, menu close callback and keybinding hints.
• pullRequest/usePullRequestListView.ts: upstream's moved pullRequestFilterProjects import plus the fork's owner filter.
• settings/SettingsSidebarNav.tsx, settings/settingsSearch.ts, routes/_chat.settings.tsx: added upstream's Secrets page next to the fork pages. The fork's isSettingsSearchItemOnPlatform now also checks secretsFeatureOnly.

Changes that had no text conflict

• packages/client-runtime/.../session.ts: 🔴 removed the fork's inner fetch retry and its test. Upstream's #27008 "retry the permissions check after a reconnect" retries in the session atom while the connection stays up, with no limit. With both, a failure stayed hidden for 31 seconds and upstream's tests timed out. A failure now shows between retries instead of after them.
• orchestration-v2/runtimeLayer.test.ts: upstream's #27221 "held queues release agent and scheduled messages" tests start a later run past a provider failure hold. The fork's rule releases that hold on the next message, so these tests now hold with a Stop instead. Both rules stay. DelegatedCompletionDelivery.fork.test.ts still covers the fork rule.
• ScheduledTaskService.schedule.test.ts: a new upstream test gets the fork's ServerSettings.layerTest().
• Also merges fork main up to #433 "disable Remove while it runs, keybinding menu on Open in".

Agent context budget

The check "Agent context budget" fails and is not required. Upstream's #23745 "keep HTML prototype selection rings visible" adds 100 bytes to mcpToolListJsonBytes. The owner decides: add the label agent-context-increase or cut text.

Checks

• checks.py (typecheck, migrations, adopted PRs, format, lint, knip): pass.
• vp run check:changed on my Mac ran before the fixes: all pass except tests. CI runs show that only session.test.ts and the two runtimeLayer.test.ts failures were real, and these now pass. The rest fail only on this machine (/private/var paths, no Electron binary, ambient T3 variables).