sync: merge upstream v1.0.170 #147
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
…ation (anomalyco#5559) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Co-authored-by: Github Action <action@github.com> Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
Resolved conflicts: - packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: Merged fork search highlighting with upstream user message markdown toggle - packages/opencode/package.json: Accept upstream v1.0.170, preserved ghostty-opentui dependency - .github/workflows/generate.yml: Keep fork-specific workflow (better error messaging) - script/publish.ts: Keep fork-specific publish script (shuvcode registry, contributors) - packages/extensions/zed/extension.toml: Accept upstream v1.0.170 - All other package.json files: Accept upstream v1.0.170 versions - bun.lock: Regenerated Preserved fork features: - PR anomalyco#4898: Search in messages (Ctrl+F with highlighting) - PR anomalyco#4791: Bash output with ANSI (ghostty-opentui) - 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 #fork-140: Toggle transparent background - Fork: Toggle session header visibility - Fork: Desktop slash commands and shell input mode - Fork: Desktop Night Owl theme - Fork: Desktop theme/font pickers and branding - Fork: Share functionality for shuv.ai - Fork: Desktop mobile responsiveness - Fork: Desktop review pane resizing New upstream feature integrated: - User message markdown toggle (enable/disable markdown rendering in user messages)
|
Important Review skippedAuto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the You can disable this status message by setting the ✨ Finishing touches🧪 Generate unit tests (beta)
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. Comment |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Resolved Conflicts
Critical Fork Feature Files (Merged Carefully)
packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: Combined fork search highlighting with upstream user message markdown togglepackages/opencode/package.json: Accepted v1.0.170, preserved ghostty-opentui dependency for ANSI terminal outputFork-Specific Files (Kept Ours)
.github/workflows/generate.yml: Fork-specific workflow with better error messagingscript/publish.ts: Fork-specific publish script (shuvcode registry, contributors)Package Version Bumps (Accepted Upstream)
packages/extensions/zed/extension.toml: Updated to v1.0.170Regenerated
bun.lock: Regenerated after conflict resolutionPreserved Fork Features
New Upstream Feature Integrated
Validation
bun turbo typecheck- All packages passbun turbo test- 330 tests pass, 1 skippedCloses #146