Skip to content

Merge upstream/main eb1510d249 into coder-only - #241

Merged
henrychu04 merged 71 commits into
coder-onlyfrom
t3code/sync-upstream-eb1510d249
Oct 23, 2026
Merged

henrychu04 merged 71 commits into
coder-onlyfrom
t3code/sync-upstream-eb1510d249

Conversation

@henrychu04

Copy link
Copy Markdown
Owner

Merges upstream ed3f965e07..eb1510d249 (68 commits) into coder-only.

Brought in

Cut

Follows upstream

Verification

  • pnpm test:coder passes (TMPDIR under /private/tmp for the known macOS ClaudeSkills caveat).
  • All typechecks in AGENTS.md, pnpm knip:check, pnpm build, and vp fmt --check over the changed files pass.
  • Unused-locals check shows no fork-caused leftovers.
  • Gateway + helper smoke against the built client (fake glab, sandboxed HOME): SMOKE OK.
  • No Node 26 or Claude Agent SDK bumps in the range; no new RPCs; the only new listener is the cut token broker.

🤖 Generated with Claude Code

shivamhwp and others added 30 commits October 22, 2026 18:17
…ingdotgg#23135)

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: GPT-6.1 Sol <noreply@openai.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…g#23808)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23840)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…h git.cafe (pingdotgg#23887)

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

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…came from (pingdotgg#23713)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Signed-off-by: Yordis Prieto <yordis.prieto@gmail.com>
Co-authored-by: Yash Singh <saiansh2525@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
t3dotgg and others added 27 commits October 22, 2026 23:53
…ine (pingdotgg#23967)

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

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

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…t started them (pingdotgg#21299)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
Co-authored-by: Theo Browne <me@theo.li>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…matches (pingdotgg#24032)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#24008)

Co-authored-by: fixfon <12512757+fixfon@users.noreply.github.com>
Co-authored-by: Claude Fable 5.1 <noreply@anthropic.com>
…uring agent screenshots (pingdotgg#24056)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23873)

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

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

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Upstream brought 68 commits (ed3f965..eb1510d), among them: Stop
stops a thread's subagents again (pingdotgg#23886), Claude approval feedback
routed to the requesting agent (pingdotgg#23657), SQLite reads routed around
writer contention (pingdotgg#23902), no full shell read on resume (pingdotgg#23987),
interrupted ACP MCP fetches aborted (pingdotgg#23955), Pi blank placeholders
(pingdotgg#23235), PR watches waking when checks finish or none report (pingdotgg#23863,
pingdotgg#23904), Codex parents resuming after native children (pingdotgg#23840), one-line
folded rows for messages from other agents (pingdotgg#23135), thread title
instructions (pingdotgg#21882), sidebar following history navigation (pingdotgg#23519),
the em-dash copy sweep (pingdotgg#23799), patched-package version pins (pingdotgg#23798),
the RPC group split that keeps handler requirements typed (pingdotgg#23813), and
upstream's test prune and restorations (pingdotgg#24058, pingdotgg#23977-pingdotgg#24011).

Resolution:
- Cut: managed Codex token renewal (pingdotgg#21786, pingdotgg#21787; its
  CodexManagedTokenBroker opens a private token listener and serves
  ChatGPT sign-in, neither carried), OTLP endpoint source fields
  (pingdotgg#23713), the issue-16534 sidebar repro fixtures, and patch files for
  packages the fork does not carry (Muse, plus the stray app-builder-lib
  and react-native-reanimated patches left by earlier syncs).
- Taken from upstream: removal of the provider-update launch
  notification (pingdotgg#23233), so its Coder seam goes with it.
- ws.ts: upstream's two-group handler split, built over the whole
  CoderWsRpcGroup with the fork-only handlers merged first.
- client-runtime pullRequests.ts: upstream's query-key normalizer, which
  restores allowStale in the detail atoms (drift removed); it drops
  expectedAccountId, which the contract does not carry, and checks keep
  no persistence or routed execute.
- pnpm-workspace.yaml: upstream's patched-package overrides, limited to
  the fork's patched packages.
- TimelineUserMessageRow.tsx: upstream's folded-row rewrite with the
  fork's video, SnapShot, and prompt-link cuts reapplied.
- Wording conflicts take upstream's em-dash rewrite with merge-request
  wording; the scheduled-tasks blurb keeps its no-webhook text.

Test adaptations and the seams doc follow in separate commits.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
- runtimeLayer.test.ts: the new PR-watch tests (pingdotgg#23863, pingdotgg#23904) expect
  merge-request summaries spelled !N.
- GitVcsDriverCore.test.ts: the split-output test (pingdotgg#23953) expects the
  driver's stdoutInvalidUtf8 field, which strict review expansion uses.
- ProjectSettingsPanel.browser.test.tsx: drop the restored "project
  settings permissions" block (pingdotgg#24011); environment scopes always grant,
  so per-project grants never disable an edit or removal. The scope and
  navigation tests stay.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
coder-only.md: the ws.ts handler split over CoderWsRpcGroup, the cut
managed Codex token broker, the pull request query normalizer without
expectedAccountId, the fork-only patched-package overrides, and the
removed provider-update launch notification seam.

sync.md: a listener check for new upstream services (boundary 6) and
deleting upstream repro fixtures under scripts/fixtures.

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.