Merge shuvcode-dev: upstream v1.1.4 sync#272
Merged
shuv1337 merged 56 commits intointegrationfrom Jan 6, 2026
Merged
Conversation
Co-authored-by: Tang Guofang <tangguofang@mychery.com>
…tables (anomalyco#7102)" This reverts commit bb09df0.
…l user prompts instead of generic tool execution descriptions
Removed section about unrelated repository.
Resolved conflicts: - bun.lock: Accept upstream - install: Keep shuvcode branding, adopt upstream version check - packages/app/src/components/terminal.tsx: Merge upstream theme logic with our mobile input support - packages/app/src/context/command.tsx: Accept upstream optimization - packages/app/src/context/layout.tsx: Accept upstream session pruning - packages/desktop/README.md: Keep shuvcode branding - sdks/vscode/package.json: Keep shuvcode branding, update version to 1.1.4 Fork features preserved: - Mobile terminal input support - Mobile responsive padding (px-3 sm:px-6) - Shuvcode branding in install script, desktop README, VSCode extension
| "version": "1.1.3", | ||
| "publisher": "latitudes-dev", | ||
| "version": "1.1.4", | ||
| "publisher": "latitudes-dev" |
There was a problem hiding this comment.
syntax: missing comma after "latitudes-dev"
Suggested change
| "publisher": "latitudes-dev" | |
| "publisher": "latitudes-dev", |
Prompt To Fix With AI
This is a comment left during a code review.
Path: sdks/vscode/package.json
Line: 6:6
Comment:
**syntax:** missing comma after `"latitudes-dev"`
```suggestion
"publisher": "latitudes-dev",
```
How can I resolve this? If you propose a fix, please make it concise.
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
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
Changes from upstream v1.1.4
Conflicts resolved
bun.lockinstallpackages/app/src/components/terminal.tsxpackages/app/src/context/command.tsxpackages/app/src/context/layout.tsxpackages/desktop/README.mdsdks/vscode/package.jsonFork features preserved
Greptile Summary
This PR syncs shuvcode with upstream sst/opencode v1.1.4, incorporating session management improvements, command palette optimization, and terminal theme updates while preserving fork-specific mobile features and branding.
Key Changes
resolveThemeVariantwhile maintaining mobile terminal input supportcreateRootfor better memory managementshuvcode --versioninstead of hardcoded valueFork Features Preserved
MobileTerminalInputcomponentpx-3 sm:px-6)Test Status
PR description states 615 tests pass with 0 failures.
Confidence Score: 1/5
sdks/vscode/package.jsoncontains a critical syntax error (missing comma on line 6) that makes it invalid JSON. This will prevent the VS Code extension from loading and must be fixed before merge.sdks/vscode/package.jsonrequires immediate fix for JSON syntax error before this PR can be mergedImportant Files Changed
shuvcode --version, shuvcode branding preserved throughoutSequence Diagram
sequenceDiagram participant Fork as shuvcode Fork participant Upstream as sst/opencode v1.1.4 participant User as User Session Note over Fork,Upstream: Merge Process Upstream->>Fork: Session pruning improvements Upstream->>Fork: Command palette optimization Upstream->>Fork: Terminal theme logic updates Upstream->>Fork: Dialog context refactoring Note over Fork: Conflict Resolution Fork->>Fork: Preserve mobile terminal input Fork->>Fork: Keep shuvcode branding Fork->>Fork: Maintain responsive padding (px-3 sm:px-6) Note over Fork,User: Enhanced Session Management User->>Fork: Open multiple sessions Fork->>Fork: Track session usage with timestamps Fork->>Fork: Prune old sessions (keep 50 most recent) Fork->>Fork: Flush scroll positions on visibility change Note over Fork,User: Terminal Features User->>Fork: Open terminal on mobile device Fork->>Fork: Detect coarse pointer/touch device Fork->>Fork: Render MobileTerminalInput component Fork->>User: Enable mobile keyboard input Note over Fork: Theme System Fork->>Fork: Get theme colors from theme context Fork->>Fork: Resolve theme variant (light/dark) Fork->>Fork: Apply to terminal using setOption Fork->>User: Dynamic theme updates