sync: merge upstream v1.0.181 #177
Closed
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
…#5816) Co-authored-by: Aiden Cline <[email protected]>
anomalyco#5843) Co-authored-by: observerw <[email protected]>
Co-authored-by: Shpetim <[email protected]>
Co-authored-by: shamil2 <[email protected]>
…5861) Co-authored-by: Yu <[email protected]>
Resolved conflicts: - bun.lock: accepted upstream version - packages/console/*/package.json: accepted upstream versions - packages/desktop/package.json: accepted upstream version - packages/enterprise/package.json: accepted upstream version - packages/extensions/zed/extension.toml: accepted upstream version - packages/function/package.json: accepted upstream version - packages/plugin/package.json: accepted upstream version - packages/sdk/js/package.json: accepted upstream version - packages/slack/package.json: accepted upstream version - packages/tauri/package.json: accepted upstream version - packages/ui/package.json: accepted upstream version - packages/util/package.json: accepted upstream version - packages/web/package.json: accepted upstream version - sdks/vscode/package.json: accepted upstream version - packages/opencode/package.json: merged (version 1.0.181-1) - packages/opencode/src/agent/agent.ts: merged fork features (minimatch, resolveFilePermission) with upstream (Log) - packages/opencode/src/session/prompt.ts: merged fork features (plugin commands) with upstream (Agent.defaultAgent) - packages/desktop/src/context/layout.tsx: merged fork features (review pane) with upstream (session pane) - packages/desktop/src/pages/session.tsx: kept fork version (mobile responsiveness, image preview, share commands) 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 - PR anomalyco#4515: Show plugins in /status - PR anomalyco#5508: Cache management command - PR ariane-emory/glob-permissions: Granular file permissions - PR fork-140: Toggle transparent background - Desktop theme/font pickers and shuvcode branding - Desktop review pane resizing and share commands - Desktop mobile viewport fixes - Desktop image preview in file viewer - Shell command cwd fix for new projects - TUI configurable spinners and layout density
|
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
Resolves merge conflicts from upstream v1.0.181 and integrates changes while preserving all fork-specific features.
Conflicts Resolved
Preserved Fork Features
Validation
Closes #176