Skip to content

Conversation

@shuv1337
Copy link
Collaborator

@shuv1337 shuv1337 commented Dec 29, 2025

Summary

This PR merges shuvcode-dev into integration, including upstream releases v1.0.207-1 through v1.0.209 plus fork-specific improvements.

Upstream Releases Included

v1.0.209

v1.0.208

  • fix(desktop): toast position
  • fix: ensure tslib is available for AWS SDK credential providers
  • zen: do not switch provider for models require stick provider

v1.0.207-1

Desktop Features (from upstream PRs)

PR Title Author
#6360 Desktop: Edit Project @dbpolito
#6368 Desktop: Sidebar subsessions support @dbpolito
#6372 Desktop: Image Preview and Dedupe File Upload @dbpolito

Desktop: Edit Project (anomalyco#6360)

  • Edit project name, icon color, and custom icon image
  • Drag-and-drop image upload for project icons
  • Color picker with 6 avatar color options

Desktop: Sidebar subsessions support (anomalyco#6368)

  • Expandable/collapsible subsessions in the sidebar
  • Chevron indicators for sessions with children
  • Click to expand/collapse, persisted expand state
  • Proper indentation for nested sessions

Desktop: Image Preview and Dedupe (anomalyco#6372)

  • Click on user message attachments to preview images in a modal
  • Parts are now sorted by ID for consistent ordering
  • Improved file upload deduplication

Other Desktop Improvements

  • fix(desktop): error page formatting
  • fix(desktop): better error messages
  • fix(desktop): throttle markdown renders
  • fix(desktop): don't show summary when already complete
  • fix(desktop): markdown lists
  • fix(desktop): performance/jankiness
  • feat(desktop): latex support
  • fix(desktop): markdown styles
  • fix(desktop): one permission at a time
  • fix(desktop): more fine-grained state updates for permissions
  • fix(desktop): max height on edit tool calls
  • fix(desktop): prevent review panel from overflowing viewport (fork fix)

Core Features

Fork-Specific Changes

  • docs: add screenshots section to README for desktop and mobile PWA
  • fix: add defensive null checks to API response handling in global-sync
  • style: adjust submit button to square shape with rounded corners
  • fix(desktop): prevent review panel from overflowing viewport - ensures review sidebar stays within viewport on narrower screens

Zen Model Updates

  • zen: add gpt 5.1 codex mini
  • zen: minimax m2.1
  • zen: do not switch provider for models require stick provider

Documentation

CI/Infra

Fork Customizations Preserved

All fork customizations from fork-features.json have been preserved:

  • Inline header with shuvcode branding
  • Mobile menu overlay
  • Theme/font pickers
  • Custom server URL settings
  • PWA service worker
  • And all other fork-specific features

Total: 81 commits merging upstream v1.0.207-1 → v1.0.209 plus fork improvements

connorads and others added 30 commits December 28, 2025 22:39
…o#6332)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
…yco#6306)

Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
…malyco#6304)

Co-authored-by: OpenCode <opencode@example.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
coleleavitt and others added 26 commits December 29, 2025 14:58
Resolved conflicts:
- packages/opencode/package.json: version bump (preserved ghostty-opentui dep)
- packages/app/package.json: version bump (preserved vite-plugin-pwa dep)
- packages/app/src/pages/session.tsx: merged upstream memoization improvements with our keyboard visibility hook
- bun.lock: regenerated after version bumps

Upstream changes include:
- Desktop auto-accept edits toggle
- Desktop performance/scrolling fixes
- Prevent truncated Claude streams
- Image preview and file upload deduplication
- LaTeX support
- Permission and scroll sync improvements
…nomalyco#6345)

Co-authored-by: Somair Ansar <somairansar@Somairs-MacBook-Air.local>
Co-authored-by: Ivan Pantic <panta@talentkit.io>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Resolved conflicts:
- .github/workflows/docs-update.yml: deleted (fork removed this workflow)
- .gitignore: merged both entries (docker/workspace + opencode-dev, logs/)
- packages/app/src/pages/layout.tsx: kept fork's inline layout structure,
  incorporated upstream's providers.all().length check for connect button

Upstream changes included:
- fix: filter messages with only step-start parts (anomalyco#6383)
- feat(format): add nixfmt formatter for Nix files (anomalyco#6380)
- fix(desktop): don't flash permissions with auto-accept
- fix(desktop): scroll sync
- fix(desktop): more performance/scrolling fixes
- feat(desktop): auto-accept edits toggle
- fix: prevent truncated Claude streams (anomalyco#6388)
- Desktop: Image Preview and Dedupe File Upload (anomalyco#6372)
@shuv1337 shuv1337 changed the title Merge upstream PRs #6360, #6368, #6372 (Desktop improvements) Merge shuvcode-dev: upstream v1.0.207-1 → v1.0.209 + fork improvements Dec 30, 2025
- Add overflow-hidden to parent flex container
- Change session pane from shrink-0 to shrink min-w-0 to allow shrinking
- Cap session width to leave minimum 320px for review panel using CSS min()

Fixes issue where review sidebar would spill off-screen when viewport
is narrower than session width + review panel minimum width.
Use RTL direction with left text-align to truncate paths from the
beginning, keeping the most relevant part (project name and branch)
visible on narrow mobile screens. Added title attribute for full
path on hover.
@shuv1337 shuv1337 merged commit 8b90266 into integration Dec 30, 2025
1 check passed
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.