Repository navigation
chore(sync): bring in upstream changes while preserving fork features - #44
Merged
Merged
Conversation
Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…6634) Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
…14273) Co-authored-by: zendergod <zendergod@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
…cus ring (pingdotgg#15188) Co-authored-by: Fionn Jones <264670603+jonesfionn101-dotcom@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…eyboards (pingdotgg#17492) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…g#17702) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…end (pingdotgg#17384) Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
…ingdotgg#18190) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…gdotgg#18191) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ngdotgg#18183) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ead (pingdotgg#17611) Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com> Co-authored-by: Claude Sonnet 5.5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
…their mock CLI cannot run (pingdotgg#18184) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: maria <maria@kuuro.net>
pingdotgg#18193) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: maria-rcks <254055478+maria-rcks@users.noreply.github.com>
Return exit 125 when the Linux cgroup wrapper target is missing, including when /bin/sh is Bash. Preserve arguments and child exit codes.
…efault (pingdotgg#18461) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…rs (pingdotgg#18476) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…odels (pingdotgg#18488) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Integrate all 374 missing upstream commits with ancestry preserved. Adopt upstream provider and source-control packages, legacy settings removal, and Git storage cleanup while retaining the fork's Jujutsu, OpenCode, SSH, notification, composer, and worktree compatibility boundaries.
github-actions
Bot
added
the
vouch:trusted
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
20 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.
Summary
The fork was missing 374 upstream commits. This merges upstream through
e688034b5fwith ancestry preserved, adopting upstream implementations wherever they cover the fork's behavior rather than keeping parallel implementations.The sync adopts the extracted provider/source-control packages, newer review and mobile flows, and upstream reliability/build improvements. It retains Jujutsu, paired notifications, SSH/Tailscale recovery, OpenCode accounts/defaults/permissions and reused-child safeguards, prompts/Vim, fuzzy search, quota weighting, Crit/Portless, and worktree behavior.
Jujutsu uses native checkpoints and is excluded from upstream's Git-only automatic workspace cleanup. The two unnecessary combobox-export and desktop-test-mock differences are also removed; no additional GitManager redesign is included.
Against the pinned upstream tip, the remaining fork delta is 382 files, +29,298 / -3,460 lines. Much of that is retained features and their tests, not missing upstream work.
Test plan
4579794ae565; the packaged commit, architecture, and existing/Applications/T3 Code (Alpha).applink were verified.e688034b5f.zizmorreports existing upstream tag-based action references and advisory findings; those are not expanded into unrelated workflow changes here.Rollout note
After merging, fast-forward the main local checkout and rebuild the macOS arm64 app there. Do not close the running app; Nicholas will restart it. Remote SSH runtime deployment is not part of this request and remains separate.
brave-tulip-laurel