sync: merge upstream v1.0.150 #127
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
Comment out the plugin entry in opencode.jsonc
…ove build performance
… glib-2.0 system library error
Resolved conflicts: - packages/opencode/package.json: Updated version to 1.0.150 - packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: Accepted upstream changes, restored double Ctrl+C exit feature (PR sst#4900) - packages/opencode/src/config/config.ts: Accepted upstream changes with super keybinds, preserved header_toggle and session_parent keybinds - script/publish.ts: Preserved fork-specific comment - .github/workflows/publish.yml: Removed (deleted in fork) - packages/ui/src/components/input.css: Removed (deleted upstream) - packages/ui/src/components/input.tsx: Removed (deleted upstream) - bun.lock: Regenerated - All package.json files: Accepted upstream version bumps - Desktop, console, enterprise files: Accepted upstream Preserved fork features: - PR sst#4900: Double Ctrl+C to exit - PR sst#4865: session_parent keybind - Fork feature: header_toggle keybind
Resolved conflicts: - packages/opencode/package.json: Updated version to 1.0.150 - packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: Accepted upstream changes, restored double Ctrl+C exit feature (PR sst#4900) - packages/opencode/src/config/config.ts: Accepted upstream changes with super keybinds, preserved header_toggle and session_parent keybinds - script/publish.ts: Preserved fork-specific comment - .github/workflows/publish.yml: Removed (deleted in fork) - packages/ui/src/components/input.css: Removed (deleted upstream) - packages/ui/src/components/input.tsx: Removed (deleted upstream) - packages/desktop/src/context/layout.tsx: Restored fork's font/theme support - packages/desktop/src/components/font-picker.tsx: Updated to use new items function signature - packages/desktop/src/components/theme-picker.tsx: Updated to use new items function signature - bun.lock: Regenerated - All package.json files: Accepted upstream version bumps - Desktop, console, enterprise files: Accepted upstream Preserved fork features: - PR sst#4900: Double Ctrl+C to exit - PR sst#4865: session_parent keybind - Fork feature: header_toggle keybind - Fork feature: Desktop font and theme pickers
|
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
Conflict Resolutions
superkeybinds, preservedheader_toggleandsession_parentkeybindsPreserved Fork Features
Closes #126