sync: merge upstream v1.0.177 #164
Merged
Conversation
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
Resolved conflicts: - package.json files: accepted upstream version 1.0.177 - bun.lock: regenerated - .github/workflows/publish.yml: kept fork-specific workflow - packages/extensions/zed/extension.toml: accepted upstream - packages/desktop/src/context/global-sdk.tsx: merged fork's fetch/throwOnError with upstream's signal change - packages/desktop/src/context/global-sync.tsx: merged upstream retry() wrappers with fork's defensive array check - packages/desktop/src/pages/layout.tsx: kept fork's inline header with theme/font pickers (upstream refactored to separate component) Preserved fork features: - Desktop inline header with shuvcode ASCII branding - ThemePicker and FontPicker components - Mobile session dropdown - Version display - Defensive array handling in global-sync - Custom fetch/throwOnError in global-sdk
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
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.
Summary
Resolved Conflicts
fetch/throwOnErrorwith upstream's signal changeretry()wrappers with fork's defensive array checkPreserved Fork Features
Validation
Closes #163