Skip to content

merge upstream/main into fork - #594

Open
adampeterhiggins wants to merge 217 commits into
mainfrom
t3code/sync-upstream-2026-11-21-28bcb737-095105
Open

adampeterhiggins wants to merge 217 commits into
mainfrom
t3code/sync-upstream-2026-11-21-28bcb737-095105

Conversation

@adampeterhiggins

Copy link
Copy Markdown
Owner

What's in this sync

New features

Fixes

Provider and performance changes

Other upstream changes include secret card visibility and multi-value fields, sign-in for MCP servers from warnings, additional syntax highlighting, compact PR reads, and the Effect 4.1.5 update. The upstream commit comparison lists the full range. pingdotgg#31257, pingdotgg#39921, pingdotgg#29261, pingdotgg#39901, pingdotgg#40132

Discord announcements were not used because the channel returned no announcement crossposts for this range.

Merge and verification

This sync targets main at d32f4eca42aa1550d393f2d62e59a74efec3e847 and pins upstream at 28bcb737360410e9849e47ce5afa984f7af6d902. The range d32f4eca42..28bcb73736 adds 216 upstream commits. The fork had 697 commits outside upstream's history.

Conflict resolutions

  • Kept both worktree RPC permissions and both sets of project settings. Added upstream's tracked-repository selection to the shared worktree strategy. Kept the fork's Cursor keyring dependency with upstream's Cursor SDK 1.4.2 and added TanStack Source to the definitions manifest.
  • Unified Claude skill discovery through the upstream symlink to .agents/skills, which contains the fork's skills and the new upstream skill.
  • Preserved the fork's account picker, agent handles, citation and attachment intake, PR-link routing, and tab behavior alongside upstream's linked-thread navigation, project repository selection, and side-thread preference. Updated mobile's older-server resume fallback to show one immediate action and kept the fork's issue links and thread-level PR controls.
  • Combined Powerline and Nerd Font rendering, retaining the fork's seam overlap for solid arrows and upstream's additional glyph shapes. Kept HTML table and citation clipboard cases.
  • Updated the fork differences for PR-link routing and usage-limit recovery, and checked the merged locale catalogs.

Moved code reviewed

  • GuestPage.tsx: upstream extracted ReadOnlyThreadTimeline for guest and linked sessions. The fork had no new file-specific commits in the sync range. The extracted component now supplies the fork's unfocusedSplitPaneRef input to its existing timeline-follow hook, and guest live-follow and send-to-end still flow through it.
  • ProviderSubagentBar.tsx: fork 3b1d7d2394 attach subagents by handle. The action remains exposed through onAttachToParent, connected to attachToParent in ChatView, and rendered in the upstream ReadOnlyComposerBar actions.
  • GitActionsControl.tsx: upstream separated checkout actions and branch following inside the file. Verified fork 96f07c3614 shared quick-message composer, c460d20a11 earlier sync, d51d60d691 (honor Open links in), 61d540f9cd choose where View PR opens, 735e44a5a0 host action in the Git menu, and 216f26c1c1 open the branch PR from Git actions. The outer thread wrapper still passes the thread ref and keeps the draft branch follower. The checkout menu carries the fork's openLink action and PR surface choice.

Server integration

  • Preserved moving a thread into an existing worktree and added task-folder creation, cleanup, and origin handling for multi-repository projects. Worktree naming before setup still applies to every checkout in a task folder, including deferred names.
  • Kept Claude's per-command working directory and structured web-fetch answers alongside upstream's multi-folder access, sign-in methods, and Unicode-safe truncation. Cursor retains the fork's credential handling with upstream's worker and background wake support.
  • Preserved scheduled tasks, usage probes, and fork MCP services alongside upstream's typed turn results and routing changes. Updated the affected test fixtures to the new service contracts.

Verification

  • Dependency installation and merge hooks passed. Typechecks passed for all 43 affected packages. Scoped format and lint checks and the web, mobile, and desktop translation catalog check passed.

  • Focused suites passed for worktree handoff, launch and naming, storage cleanup, Claude, CLIProxyAPI usage, scheduling, MCP fixtures, WebSocket, web, mobile, contracts, and the shared client/runtime.

  • The raw whitespace check reports the same diagnostics as upstream's range in the vendored Effect sources and dependency patches. The merged source has no new whitespace diagnostics.

  • Two affected MCP eval cases generated valid dry-run requests. Live model evaluation requires configured eval credentials. The measured MCP tool schema budget grew from 89,060 to 91,051 bytes with upstream's tools. The budget snapshot test passed. The budget workflow requires maintainer acceptance of the increase.

  • The changed-file gate passed formatting, lint, Knip, GraphQL generation, dependency patch checks, typechecking, and changed-file React Compiler checks (310 tests). The broad test batch timed out. In that batch, two provider scenarios and two Git integration tests timed out. The Claude suite passed in the focused run. Four cache assertions passed in isolation with a canonical macOS temporary path.

  • Earlier gate attempts unexpectedly started headless Chromium and reported web fixture failures before they were stopped. The final gate explicitly excluded browser projects and server fixtures that launch a browser. Static review identified and corrected a lost side-chat context menu. Browser runtime verification remains open.

Merge with Create a merge commit. It keeps upstream history and the merge base for the next sync.

Work completed with GPT-6.2 Sol in the Codex harness.

juliusmarminge and others added 30 commits November 20, 2026 01:37
…when they exit (pingdotgg#38348)

Co-authored-by: Claude Fable 5.2 <noreply@anthropic.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…a failure (pingdotgg#39596)

Co-authored-by: Ryan McDonough <Ryan@r2n.io>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ands (pingdotgg#39618)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…lized scroll windows (pingdotgg#39574)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…es (pingdotgg#39636)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…#39643)

Co-authored-by: Geezy <igor.licko@gloryck.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…helper (pingdotgg#39665)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…in1 string (pingdotgg#39659)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…security fixes (pingdotgg#39669)

Co-authored-by: Dominic Rubas <1042243+rubas@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
… usage (pingdotgg#39686)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…runtime (pingdotgg#39683)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#39697)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ingdotgg#39720)

Co-authored-by: Simone <185146821+Lucenx9@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#39736)

Co-authored-by: PixPMusic <PixPMusic@users.noreply.github.com>
charlesbine and others added 30 commits November 20, 2026 22:27
…art of minute (pingdotgg#40131)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…question (pingdotgg#40104)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…g#35145)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ly (pingdotgg#36939)

Co-authored-by: chief-archivist <thecradlearchives@gmail.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…40149)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
pingdotgg#40069)

Co-authored-by: Julius Marminge <julius0216@outlook.com>
…ffort summaries (pingdotgg#40136)

Co-authored-by: thecsguy <344173356+itsthecsguy@users.noreply.github.com>
Co-authored-by: Julius Marminge <julius0216@outlook.com>
…CODE_TANSTACK_SOURCE (pingdotgg#40207)

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

This branch has not been deployed

No deployments
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.