Skip to content

Conversation

@shuv1337
Copy link
Collaborator

Summary

  • Merge upstream sst/opencode v1.0.179 into the fork
  • Resolves merge conflicts while preserving all fork features

Conflicts Resolved

  • Package versions: Updated to 1.0.179 across all packages
  • packages/desktop/src/context/global-sync.tsx: Preserved fork's defensive array check for API responses
  • packages/desktop/src/pages/layout.tsx: Preserved fork's mobile responsiveness imports (createSignal, onCleanup)
  • packages/desktop/src/context/layout.tsx: Fixed duplicate type definition introduced during merge
  • .github/workflows/publish.yml: Kept fork-specific workflow configuration
  • bun.lock: Regenerated from clean install

Fork Features Preserved

All features from fork-features.json are intact:

Validation

  • All type checks pass
  • All 329 tests pass

Closes #167

Frank and others added 30 commits December 20, 2025 01:26
Resolved conflicts:
- Package versions: Accept upstream 1.0.179 versions for all packages
- packages/opencode/package.json: Updated version, preserved fork dependencies
- packages/desktop/src/context/global-sync.tsx: Preserved fork's defensive array check
- packages/desktop/src/pages/layout.tsx: Preserved fork's mobile responsiveness imports
- .github/workflows/publish.yml: Keep fork-specific workflow config
- packages/extensions/zed/extension.toml: Accept upstream version URLs
- bun.lock: Regenerated from clean install

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 #ariane-emory/glob-permissions: Granular File Permissions
- PR #fork-140: Toggle transparent background
- Fork-only: Desktop theme/font pickers, branding, mobile responsiveness
- Fork-only: Share functionality for shuv.ai infrastructure
- Fork-only: TUI configurable spinners and layout density
@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/issue167-20251220154038

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.179

6 participants