Fixed merge conflicts for Sequential Thinking ui updates #365
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: thedotmack <[email protected]>
Co-authored-by: thedotmack <[email protected]>
- Updated sessionStore.ts to enhance code readability and maintainability by standardizing quotes and formatting. - Improved error handling in fetch functions to provide clearer messages. - Added logic to handle session updates and outputs more efficiently. - Adjusted CSS styles for better consistency and readability. - Standardized quotes in hooks and configuration files for consistency. - Improved Vite configuration for better code splitting and chunk management.
…king blocks; integrate with Settings and ThinkingWidget components
…ntation validated Co-authored-by: thedotmack <[email protected]>
Copilot/fix 1
Co-authored-by: thedotmack <[email protected]>
Co-authored-by: thedotmack <[email protected]>
Docstrings generation was requested by @thedotmack. * #7 (comment) The following files were modified: * `claudia-server/examples/javascript/client.js` * `claudia-server/examples/python/client.py` * `claudia-server/src/index.ts` * `claudia-server/src/routes/claude.ts` * `claudia-server/src/routes/projects.ts` * `claudia-server/src/routes/status.ts`
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
📝 Add docstrings to `copilot/fix-6`
…udeService and ProjectService
CodeRabbit Generated Unit Tests: Add comprehensive unit tests for ClaudeService and ProjectService
Add standalone TypeScript server for Claude Code integration
|
Hi, thanks for your contribution, I saw your earlier PR but this looks good to go with a few polishes. Would you be able to squash the commits to the only relevant ones? |
|
I would.. but i don't really know cause i did this PR a while back. You would know which is more relevant :P I don't know what would overwrite your stuff. I only asked it to prefer your changes over mine |
Sallvainian
added a commit
to Sallvainian/opcode
that referenced
this pull request
Oct 16, 2025
# Conflicts: # .github/workflows/claude-code-review.yml # .github/workflows/claude.yml # package-lock.json # src/components/AgentExecution.tsx # src/components/ClaudeCodeSession.refactored.tsx # src/components/ClaudeCodeSession.tsx # src/components/FloatingPromptInput.tsx # src/components/TimelineNavigator.tsx # src/components/ToolWidgets.tsx # src/components/WebviewPreview.tsx # src/components/claude-code-session/useClaudeMessages.ts # src/components/widgets/BashWidget.tsx # src/lib/api.ts
Sallvainian
added a commit
to Sallvainian/opcode
that referenced
this pull request
Oct 16, 2025
- Add explicit type annotation to drag-drop event handler - Remove unused IME composition handler functions - Update bun.lock with new optional dependencies These fixes allow the build to complete successfully after merging PR winfunc#365. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 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.
Fixed merge conflicts for Sequential Thinking ui updates