Merged
Conversation
… into prompt context, diff display view
…#5816) Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
anomalyco#5843) Co-authored-by: observerw <observerw@users.noreply.github.com>
Co-authored-by: Shpetim <shpetim.alimi@ndbit.net>
Co-authored-by: shamil2 <shamil2@users.noreply.github.com>
…5861) Co-authored-by: Yu <YuY801103@users.noreply.github.com>
- Add IDE connection via WebSocket with JSON-RPC - Live text selection from editor displayed in footer - Selection sent as synthetic part (invisible but included in context) - IDE status visible in home screen footer - Fix reactivity with reconcile for IDE status updates Based on initial work from anomalyco#5447, with additional UX improvements.
- Remove unused ideSelectionExtmarkId variable
- Remove unused removeExtmark() function
- Fix path splitting to work on Windows (split(/[\/\]/) instead of split("/"))
Addresses Copilot review feedback on anomalyco#5873
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Wrap JSON.parse in try/catch to gracefully handle corrupted lock files instead of crashing the discovery process. Addresses Copilot review feedback on anomalyco#5873 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
Resolved conflicts: - packages/opencode/package.json: Updated to 1.0.182 - packages/opencode/src/agent/agent.ts: Merged upstream logging with fork's resolveFilePermission - packages/opencode/src/session/prompt.ts: Used upstream's Agent.defaultAgent() with fork's plugin command handling - packages/desktop/src/context/layout.tsx: Added both session.width (upstream) and review pane (fork) - packages/desktop/src/pages/session.tsx: Accepted upstream layout, re-added fork's share commands and image preview - bun.lock: Accepted upstream version - 16 package.json files: Accepted upstream versions Preserved fork features: - PR #ariane-emory/glob-permissions: Granular file permissions with resolveFilePermission() - PR anomalyco#4709: Live token usage (fork's plugin command handling preserved) - Desktop review pane resizing - Desktop share/unshare slash commands - Desktop image preview in file viewer - Desktop Night Owl theme integration
|
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 |
Adds IDE integration with server APIs from anomalyco#5447: - WebSocket-based IDE connections - IDE server endpoints and SDK types - Streamed cursor selection into prompt context - Diff display view for file edits This provides the backend foundation for IDE integration.
Applies UX improvements from anomalyco#5873: - Selection displayed in footer instead of cluttering input - Synthetic parts so selection doesn't pollute chat history - Better error handling for malformed lock files - Home screen shows IDE connection status - Windows path compatibility fixes Preserved fork features: - Double Ctrl+C to exit - Session search keybind
Add back config properties that were lost during PR merges: - keybinds.model_cycle_favorite and model_cycle_favorite_reverse - default_agent for configuring default agent - experimental.continue_loop_on_deny for agent loop behavior
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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
Resolves conflicts from upstream v1.0.182 merge. Closes #178
Resolved Conflicts
packages/opencode/package.jsonpackages/opencode/src/agent/agent.tsresolveFilePermissionpackages/opencode/src/session/prompt.tsAgent.defaultAgent()with fork's plugin command handlingpackages/desktop/src/context/layout.tsxpackages/desktop/src/pages/session.tsxbun.lockPreserved Fork Features
resolveFilePermission()function with minimatch support/shareand/unshareslash commandsValidation