Skip to content

Conversation

@shuv1337
Copy link
Collaborator

Summary

Merge upstream sst/opencode v1.0.167 into shuvcode fork.

Resolved Conflicts

  • bun.lock: Regenerated from scratch
  • packages/*/package.json: Accept upstream version (1.0.167)
  • packages/extensions/zed/extension.toml: Accept upstream version

Upstream Changes Include

  • Version bump to 1.0.167
  • Terminal title toggle feature added to config
  • MCP authentication improvements
  • Legal pages (privacy policy, terms of service)
  • Tauri package updates

Fork Features Preserved

All fork features listed in script/sync/fork-features.json remain intact:

Validation

  • ✅ Typecheck: 12/12 packages passed
  • ✅ Tests: 330 passed, 1 skipped, 0 failed

Closes #142

R44VC0RP and others added 15 commits December 17, 2025 19:08
Resolved conflicts:
- bun.lock: Regenerated from scratch
- packages/*/package.json: Accept upstream version (1.0.167)
- packages/extensions/zed/extension.toml: Accept upstream version

Upstream changes include:
- Version bump to 1.0.167
- Terminal title toggle feature added to config
- MCP authentication improvements
- Legal pages (privacy policy, terms of service)
- Tauri package updates

Fork features preserved:
- PR sst#4898: Search in messages (Ctrl+F)
- PR sst#4791: ANSI bash output support
- PR sst#4900: Double Ctrl+C to exit
- PR sst#4709: Live token usage during streaming
- PR sst#4865: Subagents sidebar navigation
- PR sst#4515: Show plugins in /status
- PR sst#5508: Cache management commands
- PR #ariane-emory: Granular file permissions
- PR #fork-140: Toggle transparent background
- Desktop features: slash commands, shell mode, themes, branding
@shuv1337 shuv1337 merged commit 7ae7673 into integration Dec 18, 2025
0 of 4 checks passed
@coderabbitai
Copy link

coderabbitai bot commented Dec 18, 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/issue142-20251218105014

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 deleted the opencode/issue142-20251218105014 branch December 18, 2025 10:59
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.167

10 participants