Skip to content

Merge upstream/main 688ee52f0e into coder-only - #221

Merged
henrychu04 merged 144 commits into
coder-onlyfrom
t3code/sync-upstream-688ee52f0e
Oct 21, 2026
Merged

henrychu04 merged 144 commits into
coder-onlyfrom
t3code/sync-upstream-688ee52f0e

Conversation

@henrychu04

Copy link
Copy Markdown
Owner

Merges upstream 688ee52f0e (140 commits since 758d773f57) into coder-only.

Upstream

Fork adaptations

  • Fork seams moved into upstream's new modules; cut surfaces that came back in them (server-update/diagnosis banners, load balancing, preview annotations, SnapShot/video tiles, Antigravity send block, WSL items) are stripped with Coder: notes.
  • supportedArchitectures stays on every host (the helper bundle ships Linux natives); upstream's Windows-only .pnpmfile.cjs is not carried.
  • Not carried: t3 thread CLI, check-changed script, Windows desktop scripts, Connections rows, usage fixtures, the webhook filter editor, and Cursor/Grok/Muse/OpenCode replay tests.
  • Upstream's pruning taken, including fork adaptations of pruned tests; fork-only seam tests kept, plus the draft-image persistence test (boundary 9).
  • Upstream un-exported a few helpers the fork still uses; kept exported with Coder: notes and listed in coder-only.md.

Verification

  • pnpm test:coder: all green (server 2,825, web 3,367, client-runtime 650, shared 814, plus providers, contracts, source control).
  • All typechecks in AGENTS.md, pnpm knip:check, pnpm build, vp fmt --check on changed files.
  • sync.md section 6 marker and lost-line checks reviewed.
  • Live smoke: gateway + helper with mocks, and the headless-browser smoke with a fake Kilo agent (markdown image, gallery, tool-output image, no render loops).

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 20, 2026 10:21
…22390)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…vent in act (pingdotgg#22424)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…; fixture README (pingdotgg#22453)

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

Co-authored-by: Pixel Perfect <me@pixp.cc>
Co-authored-by: Theo Browne <me@t3.gg>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
Co-authored-by: Utkarsh Patil <73941998+UtkarshUsername@users.noreply.github.com>
…g#22194)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…sts over REST (pingdotgg#22495)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
juliusmarminge and others added 26 commits October 21, 2026 01:36
…imelineFollow (pingdotgg#22701)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…banners are built in ThreadActivityBanners (pingdotgg#22725)

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… their own file (pingdotgg#22669)

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

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

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

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

Co-authored-by: ishaanko <ishaanko.mail@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…22767)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
140 upstream commits since 758d773. Upstream brought:
- pnpm 12.14.0 (pingdotgg#22738) and Vite+ 1.3 (pingdotgg#22716); the lockfile now pins pnpm.
- Mermaid rendered with pele instead of mermaid (pingdotgg#21472, pingdotgg#22570).
- Webhook event filters, replay dedupe, and coalescing for scheduled tasks
  (pingdotgg#22194, pingdotgg#22234, migration 067).
- A web refactor wave that splits ChatView, ChatMarkdown, ChatComposer,
  MessagesTimeline, CommandPalette, SettingsPanels, the sidebar, and the pull
  requests page into smaller modules.
- Test pruning (pingdotgg#22557 and second passes) and test-hygiene changes.
- Fixes: delegate Stop and settlement (pingdotgg#22653, pingdotgg#22709), the composer during
  approvals (pingdotgg#21503), thread-link chips (pingdotgg#22621), steer splitting (pingdotgg#22783),
  dialog close content (pingdotgg#21960), undo from the composer (pingdotgg#22607), storage
  cleanup clone accounting (pingdotgg#22713), and Codex compaction usage (pingdotgg#22558).

Resolution:
- Manifests, lockfile, and configs: fork versions plus upstream's version bumps,
  pele, vite-plus 1.3, the pnpm 12 skills permission, and upstream's providerEnv
  and browserSetup test setup. supportedArchitectures stays on every host as a
  seam; upstream's .pnpmfile.cjs (Windows-only) is not carried.
- Fork seams moved into upstream's split modules (ChatMarkdownMedia,
  Timeline*, ComposerAttachmentStrip, chatViewSend, useSystemComposerBanners,
  useDraftEnvironmentRouting, CommandPaletteLookups, BackgroundActivitySettings,
  PullRequest*); cut surfaces in the new modules are stripped with Coder: notes.
- Tests: upstream's pruning taken, including fork adaptations of pruned tests;
  fork-only tests of fork seams kept.
- Not carried: the t3 thread CLI, check-changed script, WSL items, Windows
  desktop scripts, Connections rows, usage fixtures, webhook filter editor,
  and Cursor, Grok, Muse, and OpenCode replay test files.
- Coder: marker drops are inside upstream-deleted tests or moved to the split
  modules; upstream's search badge now shows the MR number without a prefix.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…rged tests

Upstream's pruning removed the only importers of several shared exports that
cut surfaces (mobile, relay, other providers) still use; list those files in
knip.jsonc. Drop the fork-only Grok capabilities fixture that no test reads
any more.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Record the exports kept for fork tests and seams (migrationEntries,
skillOverrideSettingsPaths, the ACP Registry test helpers, and
wrapExpandedImageIndex), supportedArchitectures on every host, and the draft
persistence test kept after upstream pruned it. Drop the HtmlRenderDialog test
notes. In sync.md, cover split-module seam replay, patch -N, and knip after
test pruning.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants