Repository navigation
merge upstream/main into fork - #594
Open
adampeterhiggins wants to merge 217 commits into
Open
adampeterhiggins wants to merge 217 commits into
adampeterhiggins wants to merge 217 commits into
Conversation
…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>
…odel rejects them (pingdotgg#39684)
…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>
…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>
…ingdotgg#40128) Co-authored-by: Julius Marminge <julius0216@outlook.com>
…pingdotgg#40119) 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>
…ingdotgg#40153) 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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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
mainatd32f4eca42aa1550d393f2d62e59a74efec3e847and pins upstream at28bcb737360410e9849e47ce5afa984f7af6d902. The ranged32f4eca42..28bcb73736adds 216 upstream commits. The fork had 697 commits outside upstream's history.Conflict resolutions
.agents/skills, which contains the fork's skills and the new upstream skill.Moved code reviewed
GuestPage.tsx: upstream extractedReadOnlyThreadTimelinefor guest and linked sessions. The fork had no new file-specific commits in the sync range. The extracted component now supplies the fork'sunfocusedSplitPaneRefinput to its existing timeline-follow hook, and guest live-follow and send-to-end still flow through it.ProviderSubagentBar.tsx: fork3b1d7d2394attach subagents by handle. The action remains exposed throughonAttachToParent, connected toattachToParentin ChatView, and rendered in the upstreamReadOnlyComposerBaractions.GitActionsControl.tsx: upstream separated checkout actions and branch following inside the file. Verified fork96f07c3614shared quick-message composer,c460d20a11earlier sync,d51d60d691(honor Open links in),61d540f9cdchoose where View PR opens,735e44a5a0host action in the Git menu, and216f26c1c1open 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'sopenLinkaction and PR surface choice.Server integration
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.