-
Notifications
You must be signed in to change notification settings - Fork 3
sync: merge upstream v1.0.176 #162
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Resolved conflicts: - bun.lock: regenerated - packages/opencode/package.json: version 1.0.176-1 (fork suffix) - packages/desktop/src/context/global-sync.tsx: merged retry() with defensive array check - packages/desktop/src/context/global-sdk.tsx: merged commented signal with fetch/throwOnError - packages/desktop/src/pages/layout.tsx: preserved onCleanup import - Simple version bumps: accepted upstream for all other package.json files Preserved fork features: - PR anomalyco#4898: Search in messages - PR anomalyco#4791: Bash output with ANSI - PR anomalyco#4900: Double Ctrl+C to exit - PR anomalyco#4709: Live token usage during streaming - PR anomalyco#4865: Subagents sidebar with clickable navigation - PR anomalyco#4515: Show plugins in /status - PR anomalyco#5508: Cache management command - PR glob-permissions: Granular file permissions - PR fork-140: Toggle transparent background - Desktop slash commands and shell input mode - Desktop Night Owl theme - Desktop theme/font pickers, branding, and inline header - Share functionality for shuv.ai infrastructure - TUI configurable spinner styles - TUI layout density for small terminals
|
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 |
Summary
Resolves conflicts from upstream v1.0.176 merge.
Resolved Conflicts
bun.lockpackages/opencode/package.jsonpackages/desktop/src/context/global-sync.tsxpackages/desktop/src/context/global-sdk.tsxpackages/desktop/src/pages/layout.tsxPreserved Fork Features
Validation
Closes #161