Repository navigation
merge upstream/main (through 024d49520e) into fork - #144
Merged
Merged
Conversation
…ingdotgg#14573) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…otgg#12045) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
pingdotgg#12046) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…tale (pingdotgg#12047) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#12048) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…URL (pingdotgg#12049) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…UIScreen.main (pingdotgg#12050) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…bers (pingdotgg#12051) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ingdotgg#12052) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…ard (pingdotgg#13487) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com>
…tgg#14635) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…#14613) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…ched GraphQL (pingdotgg#14673) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…g#14678) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
pingdotgg#13926) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: t3-code[bot] <269035359+t3-code[bot]@users.noreply.github.com> Co-authored-by: maria <254055478+maria-rcks@users.noreply.github.com>
…ode browser (pingdotgg#14601) Co-authored-by: PR Batch Tester <agent@local.test> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…gdotgg#14532) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
Co-authored-by: codex <codex@users.noreply.github.com>
…ns (pingdotgg#12615) Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
# Conflicts: # apps/server/src/sourceControl/GitHubCli.ts # apps/web/src/components/Sidebar.logic.test.ts # apps/web/src/components/Sidebar.tsx # apps/web/src/components/settings/SettingsPanels.tsx # apps/web/src/components/settings/settingsSearch.ts
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
12 participants
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.
Brings in the 35 upstream commits that land before upstream's orchestrator rewrite (pingdotgg#2829,
de34391427). The fork was 184 commits ahead and 197 behind upstream/main. This PR merges upstream through024d49520e, the commit just before pingdotgg#2829.Why staged: pingdotgg#2829 replaces the orchestrator and every provider adapter (1,900 files). A full merge conflicts in 185 files, and 50 of those are files upstream deleted that the fork changed: about 4,900 lines of fork server work (usage-limit recovery, MCP write tools, thread starter, Claude/Codex/OpenCode/Cursor adapter changes, AgentsPanel). Moving that work onto the new orchestrator needs its own sync PR. After this merges, the fork is 162 commits behind.
Conflict resolutions
apps/server/src/sourceControl/GitHubCli.ts): took upstream's newguardedRead/ batched-GraphQL structure, then re-applied the fork's change that routesgh issue list|viewthrough the guarded path (from GitHub issue context, feat: attach and start threads from GitHub issues #110).Sidebar.tsx,Sidebar.logic.test.ts): kept both the fork's sidebar tabs and upstream's new Working section (beta).withSidebarTabThreadslists for search and rendering.sidebarRouteThreadKey), the same way the snoozed shelf does.SettingsPanels.tsx,settingsSearch.ts): the fork's "Tabs in sidebar" and "Sort tabs by" rows and upstream's "Working section (beta)" row all stay, with reset and search entries for each.LinearIssuePickerSheet.tsx): upstream's React Native 0.88 bump stoppedFlatListfrom accepting anullheader, so the fork-only Linear picker now passesundefined.Verification
vp i(the lockfile changed)@t3tools/contracts,t3,@t3tools/weband@t3tools/mobilevp test runpasses forSidebar.logic.test.ts,GitHubCli.test.ts,contracts/settings.test.tsandshared/serverSettings.test.ts(392 tests)vp check --fixon the resolved files gives 0 errors, andgit diff --checkis cleanMerge with Create a merge commit. It keeps upstream history and the merge base for the next sync.
Done by Claude Opus 5.5 in Claude Code (via T3 Code).
🤖 Generated with Claude Code