Skip to content

Synced fork with upstream v1.0.138#101

Closed
opencode-agent[bot] wants to merge 2 commits intointegrationfrom
opencode/issue99-20251209180809
Closed

Synced fork with upstream v1.0.138#101
opencode-agent[bot] wants to merge 2 commits intointegrationfrom
opencode/issue99-20251209180809

Conversation

@opencode-agent
Copy link
Copy Markdown

@opencode-agent opencode-agent bot commented Dec 9, 2025

All tasks completed. Here's a summary of what was accomplished:

Summary

Successfully synced the shuvcode fork with upstream sst/opencode v1.0.138.

Resolved Conflicts

File Resolution
packages/desktop/src/pages/layout.tsx Merged both - preserved fork customizations (AsciiLogo, ThemePicker, FontPicker) + adopted upstream improvements (drag-drop, Avatar, platform context)
packages/opencode/script/publish.ts Kept ours (fork-specific npm publishing as "shuvcode")
packages/sdk/openapi.json Accepted upstream (API specification)

Validation Results

  • Typecheck: Passed (11 packages)
  • Tests: 266 passed, 1 skipped, 0 failed

Actions Completed

  1. Fetched upstream tags from sst/opencode
  2. Merged v1.0.138 and resolved all conflicts
  3. Updated sync marker to v1.0.138
  4. Created and merged PR sync: merge upstream v1.0.138 #100: sync: merge upstream v1.0.138 #100
  5. Issue [Upstream Sync] Merge conflict with v1.0.138 #99 closed automatically

Closes #99

New%20session%20-%202025-12-09T18%3A08%3A09.070Z
opencode session  |  github run

@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Dec 9, 2025

Important

Review skipped

Bot user detected.

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.


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

@shuv1337 shuv1337 closed this Dec 9, 2025
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.138

1 participant