Skip to content

sync: merge upstream v1.0.180#170

Merged
shuv1337 merged 32 commits intointegrationfrom
opencode/issue169-20251220160245
Dec 20, 2025
Merged

sync: merge upstream v1.0.180#170
shuv1337 merged 32 commits intointegrationfrom
opencode/issue169-20251220160245

Conversation

@shuv1337
Copy link
Collaborator

Summary

Merge upstream changes from sst/opencode v1.0.180 into the shuvcode fork.

Resolved Conflicts

  • package.json files: Accepted upstream version 1.0.180 across all packages
  • packages/desktop/src/context/global-sync.tsx: Preserved fork's defensive array handling
  • packages/desktop/src/pages/layout.tsx: Preserved fork's imports (createSignal, onCleanup) for mobile responsiveness
  • packages/desktop/src/context/layout.tsx: Fixed duplicate LocalProject type definition
  • packages/extensions/zed/extension.toml: Accepted upstream version 1.0.180
  • .github/workflows/publish.yml: Kept fork-specific workflow configuration
  • bun.lock: Regenerated

Preserved Fork Features

  • Defensive array handling in global-sync.tsx for API response safety
  • Mobile responsiveness with onCleanup in layout.tsx
  • Fork-specific publish workflow for Latitudes-Dev/shuvcode

Validation

  • ✅ Typecheck passes
  • ✅ All 329 tests pass

Closes #169

Resolved conflicts:
- package.json files: accepted upstream version 1.0.180
- packages/desktop/src/context/global-sync.tsx: preserved fork defensive array handling
- packages/desktop/src/pages/layout.tsx: preserved fork imports (createSignal, onCleanup)
- packages/extensions/zed/extension.toml: accepted upstream version 1.0.180
- .github/workflows/publish.yml: kept fork-specific workflow configuration
- bun.lock: regenerated

Preserved fork features:
- Defensive array handling in global-sync.tsx
- Mobile responsiveness with onCleanup in layout.tsx
- Fork-specific publish workflow
@coderabbitai
Copy link

coderabbitai bot commented Dec 20, 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/issue169-20251220160245

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 860f272 into integration Dec 20, 2025
3 checks 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.180

5 participants