Merge upstream/main into fork/dev (15 commits)

[omegent-app]

15 upstream commits, fourteen conflicts. Most come from #6572 (open remote environments in your local editor over SSH), which lands squarely on surfaces this fork has rewritten.

The one that mattered

OpenInPicker. The fork replaced that component wholesale with its own "open with" system — 449 lines against upstream's 74 — so neither side could win outright. Upstream's remote path is ported into the fork's dispatch instead:

if (remote.mode === "remote-links") {
  const url = buildRemoteOpenUrl({ editor: option.id, host: remote.host.host, absolutePath: openInCwd });
  if (url === undefined) return;
  await openRemoteEditorUrl(url);
  return;
}

Without it, openInEditorMutation launches the editor on the server — for a remote environment, the wrong machine entirely. That matters more here than upstream, since this fork routinely drives several environments at once.

Other resolutions

• ElectronShell — upstream moved editor schemes into SAFE_EXTERNAL_PROTOCOLS, which returns any URL carrying one. The fork validates hostname and path first, and that check already permits upstream's <scheme>://vscode-remote/ssh-remote+… links, so the fork's stricter two-tier check stays — with the scheme list now derived from upstream's REMOTE_CAPABLE_EDITOR_IDS instead of hardcoded, so a new remote-capable editor is covered without another edit.
• LegacySidebar — the shared context after the conflict was the fork's, so upstream's block could not be spliced in without breaking indentation and duplicating the Add-project button. Kept the fork's conditional structure and ported upstream's Button migration onto it by hand.
• ChatView — upstream's glass Button styling for scroll-to-end, with the fork's unread-activity dot and label.
• build-desktop-artifact — upstream's #5877 removed WINDOWS_ASAR_UNPACK, so the fork's assertion had no symbol left to assert against; took upstream's. Its linux assertion then exposed a real gap: the fork registered t3code-dev on mac but not linux, while also declaring an explicit MimeType. Both now cover the dev scheme, so dev deep links work on Linux.
• PortExposure test — feat(web): open remote environments in your local editor over SSH pingdotgg/t3code#6572 added hasListenerOnHost to NetServiceShape; the fork's stub predated it.
• IPC / ws / contracts / ChatHeader / toast / index.css — unions of independent additions, minus the duplicate imports the union produced (EditorId, ClientSettings, BackgroundPolicy, FileSystem), each of which typecheck caught.

Verification

All 15 upstream commits checked by comparing each commit's added lines against the merged tree. Thirteen are 100% present. Two flagged, both explained:

• d7abd7f3b reports 21% — it was reverted upstream by 804cba430 in this same range, so its absence is correct.
• 57a299a78 (feat(web): open remote environments in your local editor over SSH pingdotgg/t3code#6572) reports 89% — the missing lines are upstream's OpenInPicker rewrite, deliberately not taken; its behaviour is present at OpenInPicker.tsx:391-399.

pnpm typecheck 0 errors · pnpm test — 278 files pass · vp build in apps/web · vp check --fix.

One known flake: PreviewFaviconIcon.test.tsx fails under parallel load and passes in isolation (verified twice). Pre-existing, unrelated to this merge.

Merge with gh pr merge 405 --merge, not the button — the squash default cost us the upstream lineage on #401.

Co-authored-by: Patrick Roza 42661+patroza@users.noreply.github.com

🤖 Generated with Claude Code via T3 Chat on Discord