sync: merge upstream v1.0.175#160
Closed
shuv1337 wants to merge 12 commits intointegrationfrom
Closed
Conversation
Resolved conflicts: - packages/opencode/package.json: accepted upstream version 1.0.175 - packages/desktop/src/context/global-sync.tsx: merged upstream retry wrapper with fork defensive array handling - packages/console/*/package.json: accepted upstream versions - packages/desktop/package.json: accepted upstream version - packages/enterprise/package.json: 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/extensions/zed/extension.toml: accepted upstream version - bun.lock: regenerated Preserved fork features: - Defensive array handling in global-sync.tsx (Array.isArray check)
|
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
3 participants
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 conflicts from upstream v1.0.175 merge.
Resolved Conflicts
packages/opencode/package.json: accepted upstream version 1.0.175packages/desktop/src/context/global-sync.tsx: merged upstream retry wrapper with fork defensive array handlingpackage.jsonfiles: accepted upstream version updatespackages/extensions/zed/extension.toml: accepted upstream versionbun.lock: regeneratedPreserved Fork Features
Array.isArraycheck for session list API response)Closes #159