Skip to content

Conversation

@shuv1337
Copy link
Collaborator

Summary

  • Merge upstream v1.0.174 from sst/opencode into integration branch
  • Resolved conflict in packages/opencode/script/publish.ts (kept fork-specific publishing logic)

Changes from upstream

  • Package version bumps to 1.0.174
  • Various updates across console, desktop, enterprise, and other packages

Preserved fork features

All fork-specific features preserved per script/sync/fork-features.json:

Closes #157

rekram1-node and others added 9 commits December 19, 2025 21:41
… forking session (resolves anomalyco#5495) (anomalyco#5545)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Resolved conflicts:
- packages/opencode/script/publish.ts: Keep ours (fork-specific publishing)

Preserved fork features:
- All features from PRs anomalyco#4898, anomalyco#4791, anomalyco#4900, anomalyco#4709, anomalyco#4865, anomalyco#4515, anomalyco#5508
- Glob permissions (#ariane-emory/glob-permissions)
- Toggle transparent background (#fork-140)
- Session header visibility toggle
- Desktop slash commands and shell input mode
- Desktop Night Owl theme
- Desktop theme/font pickers, branding, inline header
- Share functionality for shuv.ai
- All other fork-specific features listed in fork-features.json
@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/issue157-20251220040932

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 merged commit 3d3e4ba into integration Dec 20, 2025
3 checks passed
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.174

5 participants