Skip to content

Merge upstream/main ed3f965e07 into coder-only - #226

Merged
henrychu04 merged 133 commits into
coder-onlyfrom
t3code/sync-upstream-ed3f965e07
Oct 22, 2026
Merged

henrychu04 merged 133 commits into
coder-onlyfrom
t3code/sync-upstream-ed3f965e07

Conversation

@henrychu04

Copy link
Copy Markdown
Owner

Merges upstream/main ed3f965 (129 commits since 688ee52) into coder-only.

Carried

Not carried

Verification

  • pnpm test:coder: gateway/helper/coder-cli 119, server 2887, packages, web 3465 (after a Vite dep-reload rerun), knip — all pass
  • All AGENTS.md typechecks, pnpm knip:check, --noUnusedLocals sync check, pnpm build, vp fmt --check on changed files
  • Section 6 marker and lost-line checks; contracts unchanged vs. the previous fork deltas; no new RPCs
  • Live smoke: gateway + helper (smoke.mjs) and headless browser with fake Kilo agent (browser.mjs) both pass

🤖 Generated with Claude Code

t3dotgg and others added 30 commits October 21, 2026 03:51
… setting (pingdotgg#22841)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
…s AGENTS.md (pingdotgg#22848)

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t found" (pingdotgg#22850)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t for 3 minutes (pingdotgg#22903)

On desktop, an abandoned browser sign-in blocked every T3 Connect sign-in for 3 minutes. A new attempt now replaces the stale Clerk flow, and a Cancel bar resets the sheet. Takeover of pingdotgg#22708.

Co-authored-by: steve-ai-vibe <steve.ai.vibe@gmail.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…character catalog dump (pingdotgg#22889)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…s junctions point to (pingdotgg#21099)

Co-authored-by: sheehanmunim <80079528+sheehanmunim@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…tgg#22686)

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

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

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

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

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

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

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
juliusmarminge and others added 28 commits October 21, 2026 18:49
…2094)

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

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

Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uests (pingdotgg#23034)

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

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

Co-authored-by: Vishal <vishalprashantdoshi@gmail.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Vishal Doshi <vdoshi96@users.noreply.github.com>
…ingdotgg#23106)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Nikita Maximilian Grimm <github@nikitagrimm.de>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…tch (pingdotgg#23023)

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

Fixes pingdotgg#15682. Takes over pingdotgg#23035.

Co-authored-by: Taylor Dolezal <onlydole@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23117)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23389)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…desktop updates (pingdotgg#23113)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Brings 129 upstream commits (688ee52..ed3f965). Carried: another ChatView and
ChatComposer split into hooks (pingdotgg#23042-pingdotgg#23101), ChatView render fixes (pingdotgg#23117, pingdotgg#23124), right-to-left
text (pingdotgg#22777), network-path guards from the NTLM advisory (client parts; the server's
AssetAccess is not carried), HTTPS clone retry (pingdotgg#23170), GitLab MR diff paging (pingdotgg#21909),
pull request draft-status sync (pingdotgg#22832), Claude agents stop with their server (pingdotgg#23389),
full-access approval reasons (pingdotgg#22546), subagent cache TTL (pingdotgg#22841), idle compaction modes
(pingdotgg#23037, pingdotgg#23454), Pi fork while running (pingdotgg#23052), Codex multi-file patches (pingdotgg#22541), the
legendapp list layout-pass cap (pingdotgg#23315), and smaller server and web fixes.

Not carried: run outcome metrics (pingdotgg#22094, telemetry), the ChatGPT Business admin request
(pingdotgg#23361), tsc-rs as `typescript` (pingdotgg#23023; the fork keeps Microsoft's signed TypeScript 7),
the Node 26.12.1 engines pin (pingdotgg#23165; engines stay ^24.13.1), the add environment dialog,
the usage toggle test, and mobile, desktop, relay, and cut-provider changes.

Resolution: manifests, lockfile, and patches kept ours plus upstream's cloneUrl export and
legendapp react.js/react.mjs sections. Upstream's split modules got the fork's ChatView and
ChatComposer deltas replayed into them (lost-line checks over each old file plus its new
modules are clean; ChatView's Coder: markers 14 -> 8 and ChatComposer's 7 -> 6 moved into
the hooks). The Claude CLI transport now hands canUseTool matchedAskRule and
suppressAlwaysAllowRule; subagent cache TTL reads the settings files instead of the SDK's
resolveSettings. The draft-status and HTTPS clone-retry tests run on GitLab.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Upstream's pingdotgg#22777 gives every rendered heading a dir attribute. The fork's unit test
matches the rendered HTML as a string, so its heading-level cases now include it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
coder-only.md: TypeScript 7 kept over tsc-rs (unsigned Windows binary) and engines kept at
^24.13.1; RunMetrics, the ChatGPT Business admin request, and AddEnvironmentDialog not
carried; the ChatView split hooks' cuts; CLI can_use_tool rule fields; subagent cache TTL
read from settings files; media revision; usage page shortcut; GitLab-run tests.
sync.md: Vite dependency reloads in a fresh worktree, and string-matched HTML tests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.