Skip to content

sync: merge upstream v1.0.171#153

Merged
shuv1337 merged 18 commits intointegrationfrom
opencode/issue151-20251220031612
Dec 20, 2025
Merged

sync: merge upstream v1.0.171#153
shuv1337 merged 18 commits intointegrationfrom
opencode/issue151-20251220031612

Conversation

@shuv1337
Copy link
Collaborator

Summary

Resolves conflicts from upstream v1.0.171 merge.

Conflict Resolutions

  • README.md: Kept fork version (fork-specific documentation)
  • bun.lock: Accepted upstream version
  • packages/opencode/src/file/index.ts: Preserved fork feature (binary content detection for SVG/extensionless files)

Preserved Fork Features

  • Improved text file detection for SVG and extensionless files (fork-only)
  • isBinaryContent() function for proper binary vs text detection
  • application/octet-stream content checking for Dockerfile, Makefile, etc.

Validation

  • All typechecks pass
  • All tests pass (329 pass, 1 skip, 0 fail)

Closes #151

crob19 and others added 17 commits December 19, 2025 14:18
Resolved conflicts:
- README.md: kept fork version (fork-specific documentation)
- bun.lock: accepted upstream version
- packages/opencode/src/file/index.ts: preserved fork feature (binary content detection)

Preserved fork features:
- Improved text file detection for SVG and extensionless files (fork-only)
- isBinaryContent() function for proper binary vs text detection
- application/octet-stream content checking for Dockerfile, Makefile, etc.
@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/issue151-20251220031612

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 1aeab50 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.171

6 participants