Skip to content

Merge shuvcode-dev: upstream v1.1.4 sync#272

Merged
shuv1337 merged 56 commits intointegrationfrom
shuvcode-dev
Jan 6, 2026
Merged

Merge shuvcode-dev: upstream v1.1.4 sync#272
shuv1337 merged 56 commits intointegrationfrom
shuvcode-dev

Conversation

@shuv1337
Copy link
Collaborator

@shuv1337 shuv1337 commented Jan 6, 2026

Summary

  • Sync with upstream sst/opencode v1.1.4
  • All merge conflicts resolved preserving fork-specific features
  • Tests pass (615 pass, 0 fail)

Changes from upstream v1.1.4

  • Session pruning improvements in layout context
  • Command palette optimization
  • Terminal theme logic updates
  • Various bug fixes and improvements

Conflicts resolved

File Resolution
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 throughout

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

  • Session Management: Adopted upstream session pruning that limits stored sessions to 50 most recent, with LRU-based cleanup and scroll position persistence
  • Terminal Theme Logic: Merged upstream's simplified theme system using resolveThemeVariant while maintaining mobile terminal input support
  • Command Palette: Applied upstream optimization removing redundant cleanup logic
  • Dialog Context: Upstream refactored to use createRoot for better memory management
  • Install Script: Improved version checking using shuvcode --version instead of hardcoded value

Fork Features Preserved

  • Mobile terminal input support with MobileTerminalInput component
  • Mobile-responsive padding (px-3 sm:px-6)
  • Shuvcode branding across all user-facing assets

Test Status

PR description states 615 tests pass with 0 failures.

Confidence Score: 1/5

  • This PR cannot be merged due to a JSON syntax error that will break the VS Code extension
  • The merge is well-documented and conflicts were resolved appropriately, but sdks/vscode/package.json contains 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.json requires immediate fix for JSON syntax error before this PR can be merged

Important Files Changed

Filename Overview
sdks/vscode/package.json version bumped to 1.1.4, branding updated, but contains JSON syntax error (missing comma on line 6)
packages/app/src/components/terminal.tsx merged upstream theme logic with fork's mobile input support, simplified theme handling, removed redundant functions
packages/app/src/context/layout.tsx adopted upstream session pruning improvements with scroll persistence, better memory management for long-running sessions
install version check improved to use shuvcode --version, shuvcode branding preserved throughout
packages/app/src/context/layout-scroll.ts new file from upstream implementing debounced scroll persistence for better performance

Sequence 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
Loading

OpeOginni and others added 30 commits January 5, 2026 13:32
Co-authored-by: Tang Guofang <tangguofang@mychery.com>
mwolting and others added 26 commits January 6, 2026 11:56
…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
@shuv1337 shuv1337 merged commit 9ca3d8c into integration Jan 6, 2026
1 of 2 checks passed
Copy link

@greptile-apps greptile-apps bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

99 files reviewed, 1 comment

Edit Code Review Agent Settings | Greptile

"version": "1.1.3",
"publisher": "latitudes-dev",
"version": "1.1.4",
"publisher": "latitudes-dev"
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.