Skip to content

sync: merge upstream v1.0.146 and resolve conflicts#118

Merged
shuv1337 merged 72 commits intointegrationfrom
opencode/issue117-20251211083034
Dec 11, 2025
Merged

sync: merge upstream v1.0.146 and resolve conflicts#118
shuv1337 merged 72 commits intointegrationfrom
opencode/issue117-20251211083034

Conversation

@shuv1337
Copy link
Collaborator

Summary

  • Merges upstream tag v1.0.146 from sst/opencode into the fork
  • Resolves merge conflicts in fork-specific customizations
  • Fixes type errors introduced by upstream API changes

Changes

Upstream merge (v1.0.146):

  • New model selection dialog UI
  • Updated SDK types (Command, ProviderListResponse)
  • SelectDialog component API changes (removed onHighlight prop)
  • Icon set changes (removed type and droplet icons)
  • useKittyKeyboard type change from boolean to object

Fork conflict resolution:

  • layout.tsx: Re-added theme/font state and accessors for fork's theme/font picker features
  • global-sync.tsx: Added command property to State type for slash commands
  • font-picker.tsx: Removed onHighlight prop, changed icon to code-lines
  • theme-picker.tsx: Removed onHighlight prop, changed icon to glasses
  • app.tsx: Updated useKittyKeyboard from true to {} (object format)

Closes #117

rekram1-node and others added 30 commits December 10, 2025 14:48
Co-authored-by: Ingo Fruend <ingo@oudyo.com>
- Tauri app now automatically finds an available port instead of defaulting to 4096
- Icon discovery feature is now enabled by default in the Tauri app
- Prevents port conflicts when multiple OpenCode instances are running
Frontend now receives the server port via window.__OPENCODE__.port,
allowing it to connect when using a random free port instead of hardcoded 4096
Signed-off-by: Christian Stewart <christian@aperture.us>
…co#5337)

Signed-off-by: Christian Stewart <christian@aperture.us>
actions-user and others added 28 commits December 11, 2025 03:22
- Add og:image and twitter:image meta tags for better social sharing
- Generate dynamic social card URLs with session title, models, and version
- Include description meta tag for search engines
- Add og:image and twitter:image meta tags to entry-server
- Provide fallback social card image for pages without specific social cards
Resolved conflicts:
- .github/workflows/opencode.yml: Keep ours (fork-specific workflow)
- .github/workflows/publish.yml: Deleted (fork-specific, not needed)
- packages/desktop/src/components/prompt-input.tsx: Accept upstream (new model dialog UI)
- packages/desktop/src/context/global-sync.tsx: Accept upstream (provider types)
- packages/desktop/src/context/layout.tsx: Accept upstream (dialog state management)
- packages/desktop/src/pages/home.tsx: Accept upstream (project list fix)
- packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: Accept upstream (styling fix)
- packages/opencode/src/session/prompt.ts: Accept upstream (better error handling)
- packages/ui/src/components/icon.tsx: Accept upstream (new icons)
- packages/ui/src/components/select-dialog.tsx: Accept upstream (actions prop)
- layout.tsx: add theme/font state and accessors for fork customizations
- global-sync.tsx: add command property to State type for sync context
- font-picker.tsx: remove onHighlight prop (removed upstream), use code-lines icon
- theme-picker.tsx: remove onHighlight prop (removed upstream), use glasses icon
- app.tsx: update useKittyKeyboard from boolean to object format
@coderabbitai
Copy link

coderabbitai bot commented Dec 11, 2025

Important

Review skipped

Auto reviews are disabled on this repository.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
  • Commit unit tests in branch opencode/issue117-20251211083034

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

@shuv1337 shuv1337 merged commit 22886f0 into integration Dec 11, 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.

[Upstream Sync] Merge conflict with v1.0.146

Comments