Skip to content

Conversation

@shuv1337
Copy link
Collaborator

Summary

Resolves conflicts from upstream v1.0.176 merge.

Resolved Conflicts

File Resolution
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

Validation

  • Typecheck passed (12 packages)
  • Tests passed (329 tests, 1 skipped)

Closes #161

Frank and others added 20 commits December 20, 2025 01:26
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
@coderabbitai
Copy link

coderabbitai bot commented Dec 20, 2025

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch opencode/issue161-20251220123030

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.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@shuv1337 shuv1337 closed this Dec 20, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Upstream Sync] Merge conflict with v1.0.176

4 participants