Skip to content

Conversation

@opencode-agent
Copy link

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

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

Summary

Successfully merged upstream sst/opencode v1.0.133 into the shuvcode fork.

Conflicts Resolved

  1. github/action.yml - Merged both:

    • Kept fork-specific OPENCODE_BIN_PATH env var and run command
    • Added upstream's new PROMPT env var
  2. packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx - Merged both:

    • Kept our text: string getter in PromptRef
    • Added upstream's current: PromptInfo getter to PromptRef
  3. packages/opencode/src/cli/cmd/tui/routes/session/index.tsx - Merged both:

    • Kept our bash output view, search mode, and initialValue prop
    • Added upstream's usePromptRef import and promptRef.set(r) call in the Prompt ref callback

Validation

  • All typechecks passed (11 packages)
  • All tests passed (265 tests, 1 skipped)

Result

Closes #86

New%20session%20-%202025-12-04T22%3A06%3A06.779Z
opencode session  |  github run

code-yeongyu and others added 24 commits December 3, 2025 22:28
Co-authored-by: Github Action <action@github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
Co-authored-by: Github Action <action@github.com>
Co-authored-by: Dax Raad <d@ironbay.co>
Resolved conflicts:
- github/action.yml: merged both - kept fork-specific OPENCODE_BIN_PATH and added upstream PROMPT env var
- packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: merged both - kept our 'text' getter and added upstream 'current' getter to PromptRef
- packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: merged both - kept bash output view, search mode, initialValue prop, and integrated upstream promptRef.set()
@coderabbitai
Copy link

coderabbitai bot commented Dec 4, 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 5, 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.133