Skip to content

Synced upstream v1.0.141, PR #103 merged#104

Closed
opencode-agent[bot] wants to merge 110 commits intointegrationfrom
opencode/issue102-20251210030021
Closed

Synced upstream v1.0.141, PR #103 merged#104
opencode-agent[bot] wants to merge 110 commits intointegrationfrom
opencode/issue102-20251210030021

Conversation

@opencode-agent
Copy link

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

Summary

Successfully synced the shuvcode fork from upstream sst/opencode tag v1.0.141.

Resolved Conflicts

File Resolution
.github/workflows/publish.yml Removed (kept fork workflows)
.github/workflows/snapshot.yml Kept ours (fork-specific workflow)
packages/desktop/src/context/global-sync.tsx Merged (preserved error handling + upstream color feature)
packages/desktop/src/pages/layout.tsx Merged (added upstream feedback button)
packages/opencode/script/publish.ts Kept ours (fork publishing)
packages/plugin/script/publish.ts Kept ours (skip plugin publish)
packages/script/src/index.ts Kept ours (version logic)
packages/sdk/js/openapi.json Removed (deleted upstream)
packages/sdk/js/script/publish.ts Kept ours (skip SDK publish)
packages/sdk/openapi.json Accepted upstream
script/publish.ts Kept ours (fork publishing)

Validation Results

  • Typecheck: Passed (12 packages)
  • Tests: Passed (271 tests, 1 skipped)

PR & Issue

Closes #102

New%20session%20-%202025-12-10T03%3A00%3A21.106Z
opencode session  |  github run

thdxr and others added 26 commits December 9, 2025 20:50
npm dist-tag add command is broken, so publish package multiple times
with different tags directly instead
Resolved conflicts:
- .github/workflows/publish.yml - removed (keep fork-specific workflows)
- .github/workflows/snapshot.yml - kept ours (fork-specific workflow)
- packages/desktop/src/context/global-sync.tsx - merged (preserved error handling with upstream color feature)
- packages/desktop/src/pages/layout.tsx - merged (added upstream feedback button)
- packages/opencode/script/publish.ts - kept ours (fork-specific publishing)
- packages/plugin/script/publish.ts - kept ours (skip plugin publish for fork)
- packages/script/src/index.ts - kept ours (version logic)
- packages/sdk/js/openapi.json - removed (deleted upstream)
- packages/sdk/js/script/publish.ts - kept ours (skip SDK publish for fork)
- packages/sdk/openapi.json - accepted upstream (openapi schema)
- script/publish.ts - kept ours (fork-specific publishing)
- bun.lock - regenerated
@coderabbitai
Copy link

coderabbitai bot commented Dec 10, 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 10, 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.141

9 participants