Merge shuvcode-dev into integration #206
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
Resolved conflicts: - packages/app/src/pages/layout.tsx: Kept fork customizations (shuvcode branding, theme/font pickers, mobile menu, session rename dialog), incorporated upstream improvements (keybind display in tooltips, untrack() for project expand, animate-pulse for busy sessions)
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span> | ||
| <div class="flex items-center gap-1.5"> | ||
| <ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} /> | ||
| {/* <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span> */} |
There was a problem hiding this comment.
style: commented out percentage text display - remove entirely if no longer needed
Suggested change
| {/* <span class="text-12-medium text-text-weak">{`${ctx().percentage ?? 0}%`}</span> */} | |
| <ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} /> |
Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!
Prompt To Fix With AI
This is a comment left during a code review.
Path: packages/app/src/components/session-context-usage.tsx
Line: 57:57
Comment:
**style:** commented out percentage text display - remove entirely if no longer needed
```suggestion
<ProgressCircle size={16} strokeWidth={2} percentage={ctx().percentage ?? 0} />
```
<sub>Note: If this suggestion doesn't match your team's coding style, reply to this and let me know. I'll remember it for next time!</sub>
How can I resolve this? If you propose a fix, please make it concise.
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
Greptile Summary
This PR merges
shuvcode-devintointegration, syncing to upstream v1.0.203 and consolidating various desktop/TUI improvements.Key Changes:
config_windows→config_win) for Java LSP, added Haskell Language Server support with.lhsextensionstrip()function that was removing outer HTML tagsMinor Issue:
session-context-usage.tsx(line 57) should be removed if no longer neededConfidence Score: 5/5
Important Files Changed
Sequence Diagram
sequenceDiagram participant User participant TUI as TUI Prompt participant WebApp as Web App participant PromptInput as Prompt Input participant SessionContext as Session Context Usage participant Layout as Layout Page participant LSP as LSP Server Note over TUI: TUI Styling Improvements User->>TUI: View prompt interface TUI->>TUI: Render mode indicator with top margin Note over WebApp,SessionContext: Context Usage UI Repositioning User->>WebApp: View session WebApp->>PromptInput: Render input field PromptInput->>SessionContext: Position at top-right SessionContext->>SessionContext: Show progress circle only SessionContext->>User: Display tooltip on hover Note over Layout: Session Management Enhancements User->>Layout: Navigate to session Layout->>Layout: Expand project directory Layout->>Layout: Scroll to active session Layout->>Layout: Show pulse animation for working session Layout->>User: Display keybind hints in tooltips Note over LSP: LSP Server Improvements User->>LSP: Open Haskell file (.hs/.lhs) LSP->>LSP: Spawn haskell-language-server LSP->>User: Provide language intelligence User->>LSP: Open Java file on Windows LSP->>LSP: Load config_win (fixed path) LSP->>User: Provide Java language support