sync: merge upstream v1.0.146 and resolve conflicts#118
Merged
shuv1337 merged 72 commits intointegrationfrom Dec 11, 2025
Merged
sync: merge upstream v1.0.146 and resolve conflicts#118shuv1337 merged 72 commits intointegrationfrom
shuv1337 merged 72 commits intointegrationfrom
Conversation
Co-authored-by: Ingo Fruend <ingo@oudyo.com>
- Tauri app now automatically finds an available port instead of defaulting to 4096 - Icon discovery feature is now enabled by default in the Tauri app - Prevents port conflicts when multiple OpenCode instances are running
Frontend now receives the server port via window.__OPENCODE__.port, allowing it to connect when using a random free port instead of hardcoded 4096
Signed-off-by: Christian Stewart <christian@aperture.us>
…co#5337) Signed-off-by: Christian Stewart <christian@aperture.us>
- Add og:image and twitter:image meta tags for better social sharing - Generate dynamic social card URLs with session title, models, and version - Include description meta tag for search engines
- Add og:image and twitter:image meta tags to entry-server - Provide fallback social card image for pages without specific social cards
Resolved conflicts: - .github/workflows/opencode.yml: Keep ours (fork-specific workflow) - .github/workflows/publish.yml: Deleted (fork-specific, not needed) - packages/desktop/src/components/prompt-input.tsx: Accept upstream (new model dialog UI) - packages/desktop/src/context/global-sync.tsx: Accept upstream (provider types) - packages/desktop/src/context/layout.tsx: Accept upstream (dialog state management) - packages/desktop/src/pages/home.tsx: Accept upstream (project list fix) - packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: Accept upstream (styling fix) - packages/opencode/src/session/prompt.ts: Accept upstream (better error handling) - packages/ui/src/components/icon.tsx: Accept upstream (new icons) - packages/ui/src/components/select-dialog.tsx: Accept upstream (actions prop)
- layout.tsx: add theme/font state and accessors for fork customizations - global-sync.tsx: add command property to State type for sync context - font-picker.tsx: remove onHighlight prop (removed upstream), use code-lines icon - theme-picker.tsx: remove onHighlight prop (removed upstream), use glasses icon - app.tsx: update useKittyKeyboard from boolean to object format
|
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 |
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.
Summary
v1.0.146fromsst/opencodeinto the forkChanges
Upstream merge (v1.0.146):
onHighlightprop)typeanddropleticons)useKittyKeyboardtype change from boolean to objectFork conflict resolution:
layout.tsx: Re-added theme/font state and accessors for fork's theme/font picker featuresglobal-sync.tsx: Addedcommandproperty to State type for slash commandsfont-picker.tsx: RemovedonHighlightprop, changed icon tocode-linestheme-picker.tsx: RemovedonHighlightprop, changed icon toglassesapp.tsx: UpdateduseKittyKeyboardfromtrueto{}(object format)Closes #117