Skip to content

Merge upstream 7df7cb9999 (sync stage 1 of 2) - #256

Merged
henrychu04 merged 264 commits into
coder-onlyfrom
t3code/sync-upstream-7df7cb9999
Oct 27, 2026
Merged

henrychu04 merged 264 commits into
coder-onlyfrom
t3code/sync-upstream-7df7cb9999

Conversation

@henrychu04

Copy link
Copy Markdown
Owner

Stage 1 of the be1d066 → becf853 upstream sync: upstream main through 7df7cb9 (258 commits). It stops at the parent of pingdotgg#25324, which turns the new design on by default; stage 2 (pingdotgg#25324 → becf853, about 111 commits) follows separately.

Carried

Cut

Adaptations after the merge commit

  • Gateway CSP hash updated for upstream's edited index.html boot script.
  • Restored the "run when the thread settles" switch. Upstream and the fork both still had it, but the merge dropped it.
  • Six new transitive packages pinned to upstream's resolved versions. The license overrides name upstream's versions, so the newer ones broke the build.
  • knip cleanup.
  • coder-only.md updated with the seams. sync.md gains the lockfile pin, restored dependencies, the CSP hash, and a new check for lines lost even though both sides kept them.

Open choice

The GitLab merge request summary keeps the fork's batched GraphQL read instead of upstream's new one-call-per-MR summary (pingdotgg#22583). The hover preview is now upstream's.

Verification

  • All typechecks in AGENTS.md pass. pnpm knip:check, pnpm build, and vp fmt --check on the changed files pass.
  • pnpm test:coder passes. Server: 3,162 tests. Web: 3,767 unit and browser tests. The known localApi.test.ts hook-timeout flake (Tests that flake under full-suite load #236) failed once under full-suite load, then passed alone and on a full web rerun.
  • Section 6 checks: marker counts, lost upstream lines, unused locals, and the new check for lines both sides kept.
  • Smoke tests with mocks: the gateway with the helper (web client, thread search, MR filter options), and signed assets (images, video, HTML, PDF, favicon, uploads).
  • The bundled Linux helper boots in a node:24 amd64 container and extracts notebook text through __document-text.
  • Not done: a live Coder workspace check.

🤖 Generated with Claude Code

juliusmarminge and others added 30 commits October 24, 2026 17:17
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…empty detail (pingdotgg#24524)

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

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

Co-authored-by: lovelycodemonkey <ghassemimahyad@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#24622)

Takes over pingdotgg#23490 by Ennio Cuteri, adding a frame limit on the settle loop and reporting positioned when its target disappears.

Co-authored-by: Ennio Cuteri <ennio.cuteri@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…g#24616)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Afonso Ferreira <afonsoferreira29@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…S 26.6 (pingdotgg#24492)

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

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

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

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

Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
… per session (pingdotgg#24654)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 27 commits October 25, 2026 19:51
…ollow owner (pingdotgg#25148)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ich attach through ref callbacks (pingdotgg#25246)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ll drops its sync effects (pingdotgg#25239)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ment now show (pingdotgg#25229)

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

Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…e app (pingdotgg#25233)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t in effects (pingdotgg#25234)

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Stage 1 of the be1d066 -> becf853 sync: 258 upstream commits, up to the
parent of pingdotgg#25324 (new design on by default).

Upstream brought the new design behind a Beta toggle (pingdotgg#24865), Settings and
Usage as modals over the thread (pingdotgg#24847), office/PDF/archive/sqlite/font/
mermaid/notebook/audio file previews (pingdotgg#21362, pingdotgg#21466, pingdotgg#21467, pingdotgg#21469, pingdotgg#21363),
PDF documents and office text for Claude (pingdotgg#21358), request_secret file
delivery (pingdotgg#24809), thread families, worktree thread ids and older settled
threads, queued-run editing, effect-free React refactors, lint-driven
rewrites, and @pierre/diffs 1.6.1 with @pierre/highlights.

Cut: guest thread sharing (pingdotgg#24104; contracts and the orchestration decider
stay because the contract unions need them), LAN direct endpoints (pingdotgg#24588),
telemetry and usage additions, the usage route, desktop SnapShot state,
the host-freeze toast and legacy-permission notice, render-metrics scenarios,
and upstream's mobile, desktop, release, and task-cache tooling.

Resolution: 1,033 modify/delete conflicts stay deleted by the fork, 245 more
fork-deleted files outside the deleted paths stay deleted, and 161 content
conflicts were resolved by taking upstream's file and replaying the listed
seams. Coder: marker drops are in blocks upstream replaced: PullRequestLinkPreview
(upstream now reads previewCard itself, pingdotgg#22583), openPullRequestLink (its
project matching moved to client-runtime changeRequestLinks.ts, pingdotgg#24738), and
runtimeInstructions.ts (upstream's new link text no longer mentions MCP).
yauzl and jszip return as dependencies for upstream's document text and office
previews; @napi-rs/canvas is ignored so no native binary installs locally; the
@pierre/diffs 1.6.1 patch carries the fork's null-return loader hunks.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's comment pruning changed apps/web/index.html's inline boot script.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Both sides still had the switch; the merge result lost it and left its setter
and the cut preview fields' setters unused.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Re-resolving the lockfile picked newer @nodable/entities, fast-xml-builder,
strnum, xml-naming, core-util-is, and @types/emscripten than upstream's, which
broke the license overrides that name upstream's versions.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Ignore unused exports of upstream files whose callers are cut (guest sharing,
mobile thread cache, server workspace-snapshot helpers), keep isGitLabProject
module-private, and drop documentActivity.ts, which only the uncarried
permissions UI imports.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
coder-only.md lists the new seams and cuts; sync.md adds the lockfile version
pin, restored dependencies, gateway CSP hash, and a both-sides loss check.

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.