Skip to content

Conversation

@shuv1337
Copy link
Collaborator

Summary

  • Merges upstream v1.0.169 into shuvcode fork
  • Resolves conflict in script/publish.ts by keeping fork version (fork-specific publishing)

Upstream Changes Integrated

  • New dialog-subagent component for task tool rendering
  • Improved error handling in message-v2.ts
  • Added null directory guards in global-sync.tsx

Fork Features Preserved

All fork features remain intact:

Closes #144

rgodha24 and others added 10 commits December 18, 2025 18:17
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Resolved conflicts:
- script/publish.ts: kept fork version (fork-specific publishing to Latitudes-Dev/shuvcode)

Auto-merged files with upstream improvements:
- packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: new dialog-subagent component
- packages/opencode/src/session/message-v2.ts: improved error handling
- packages/desktop/src/context/global-sync.tsx: added null directory guards

Preserved fork features:
- PR anomalyco#4898: Search in messages (Ctrl+F)
- 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#5508: Cache management command
- Glob permissions feature
- Toggle transparent background
- Desktop slash commands and share functionality
@coderabbitai
Copy link

coderabbitai bot commented Dec 19, 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/issue144-20251219021522

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 64ef22c into integration Dec 19, 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.169

7 participants