Skip to content

Conversation

@opencode-agent
Copy link

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

Upstream sync complete. Here's the summary:

Upstream Sync Complete

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

Actions Taken:

  1. Fetched upstream tags from sst/opencode
  2. Merged v1.0.130 and resolved all 4 conflicts:
    • AGENTS.md: Preserved fork-specific IMPORTANT section + upstream Debugging section
    • packages/opencode/script/build.ts: Kept shuvcode naming + incorporated upstream Windows path fix
    • packages/opencode/src/session/processor.ts: Merged both Token and Provider imports
    • packages/opencode/src/tool/task.ts: Kept filterSubagents export + upstream Config import
  3. Fixed type error in prompt.ts (model.modelID -> model.id)
  4. Updated sync marker to v1.0.130
  5. Validated with typecheck and tests (all passing)
  6. Created PR sync: merge upstream v1.0.130 #81: sync: merge upstream v1.0.130 #81
  7. Set PR to auto-merge when CI checks pass
  8. Issue [Upstream Sync] Merge conflict with v1.0.130 #80 was already closed

Closes #80

New%20session%20-%202025-12-04T03%3A40%3A24.893Z
opencode session  |  github run

actions-user and others added 28 commits December 3, 2025 12:04
…ould only be available to primary agents (anomalyco#4913)

Co-authored-by: GitHub Action <action@github.com>
…ge (implements anomalyco#4847) (anomalyco#4855)

Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com>
Add comprehensive test suite for Provider module to ensure safe
refactoring of provider internals. Tests cover:
- Provider loading from env vars and config
- Provider filtering (disabled_providers, enabled_providers)
- Model whitelist/blacklist
- Model aliasing and custom providers
- getModel, getProvider, closest, defaultModel functions

Also adds Env module for instance-scoped environment variable access,
enabling isolated test environments without global state pollution.
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com>
Co-authored-by: thdxr <thdxr@users.noreply.github.com>
Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
Resolved conflicts:
- AGENTS.md: kept fork-specific IMPORTANT section + upstream Debugging section
- packages/opencode/script/build.ts: kept shuvcode naming + upstream Windows path fix
- packages/opencode/src/session/processor.ts: kept both Token import and Provider type import
- packages/opencode/src/tool/task.ts: kept filterSubagents export + upstream Config import
Fixed type error in prompt.ts: model.modelID -> model.id
@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 4, 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.130

10 participants