Sync upstream v1.0.221 and desktop improvements#232
Merged
shuv1337 merged 26 commits intointegrationfrom Dec 31, 2025
Merged
Conversation
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
…nomalyco#6528)" This reverts commit 87f9ebd.
…r/model" This reverts commit eb81994.
…er/model" This reverts commit 9d32a0354f1db3ea4893f4ad00900c6420ab78c6.
Resolved conflicts: - bun.lock: accepted upstream - prompt-input.tsx: kept fork's larger mobile submit button (size-8 rounded-md) - global-sync.tsx: kept fork's defensive Array.isArray() checks with upstream's filter chaining - layout.tsx: adopted upstream's Mark logo link and TooltipKeybind component - session.tsx: kept fork's version (no upstream Header component - we use inline header in layout.tsx)
![greptile-apps[bot]](https://avatars.githubusercontent.com/in/867647?s=60&v=4){kind=small}
| icon={working() ? "stop" : "arrow-up"} | ||
| variant="primary" | ||
| class="size-8 rounded-md" | ||
| class="size-8 rounded-md" |
There was a problem hiding this comment.
syntax: indentation is missing on this line
Suggested change
| class="size-8 rounded-md" | |
| class="size-8 rounded-md" |
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/prompt-input.tsx
Line: 1498:1498
Comment:
**syntax:** indentation is missing on this line
```suggestion
class="size-8 rounded-md"
```
<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.Apply Greptile suggestion to fix missing indentation on class attribute.
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
6 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
Merge upstream opencode v1.0.221 changes into the shuvcode integration branch, including desktop app improvements, model selector enhancements, and LSP workspace file watching support.
Changes
Features
Fixes
Refactoring
Infrastructure
Breaking Changes
None
Testing
Production builds tested locally:
Greptile Summary
This PR successfully merges upstream opencode v1.0.221 changes into the shuvcode fork, bringing significant desktop app improvements, UI enhancements, and LSP workspace file watching support.
Key Changes:
.catch()blocks on all async operations, including storage operations that now fall back to in-memory storage when Tauri Store failsModelSelectorPopovercomponent for quick model selection without opening a full dialog, extracted reusableModelListcomponentworkspace/didChangeWatchedFilesnotification support for better file system monitoring in LSP serversTooltipKeybindcomponent for consistent display of keyboard shortcuts across the UI@ai-sdk/openai-compatiblewhen no provider package is specifiedTesting Notes:
The PR description confirms production builds were tested locally with CLI binary, app UI, and browser tests all passing.
Confidence Score: 4/5
prompt-input.tsxline 1498 that needs fixing. The defensive programming patterns added to the desktop app properly prevent crashes from Tauri API failures.packages/app/src/components/prompt-input.tsxneeds attention for the indentation fix on line 1498Important Files Changed
@ai-sdk/openai-compatiblewhen no package specifiedSequence Diagram
sequenceDiagram participant User participant App participant PermissionContext participant GlobalSDK participant LSPClient participant Desktop User->>App: Toggle auto-accept edits App->>PermissionContext: toggleAutoAccept(sessionID, directory) PermissionContext->>GlobalSDK: Listen to permission.updated events PermissionContext->>GlobalSDK: permission.list({directory}) GlobalSDK-->>PermissionContext: Return pending permissions PermissionContext->>PermissionContext: Check shouldAutoAccept(perm) PermissionContext->>GlobalSDK: permission.respond({once}) User->>App: Select model via popover App->>App: ModelSelectorPopover renders User->>App: Click model App->>App: local.model.set(modelID, providerID) App->>App: Close popover User->>App: Edit file in workspace App->>LSPClient: notify.open({path}) LSPClient->>LSPClient: Check if file version exists LSPClient->>LSPClient: Send workspace/didChangeWatchedFiles LSPClient->>LSPClient: Send textDocument/didChange or didOpen Desktop->>Desktop: Initialize storage Desktop->>Desktop: Try Store.load(name) alt Store fails Desktop->>Desktop: Fallback to memory storage end Desktop-->>App: Return storage API with error handling