Merged upstream v1.0.134, PR #90 created#91
Closed
opencode-agent[bot] wants to merge 61 commits intointegrationfrom
Closed
Merged upstream v1.0.134, PR #90 created#91opencode-agent[bot] wants to merge 61 commits intointegrationfrom
opencode-agent[bot] wants to merge 61 commits intointegrationfrom
Conversation
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>
…ot explicitly defined
Co-authored-by: Github Action <action@github.com> Co-authored-by: Dax Raad <d@ironbay.co>
This reverts commit d763c11.
This reverts commit f9dcd97.
Provider credentials field was being selected from ProviderTable even when the table wasn't joined (when byokProvider was undefined). Now the join is conditional - when byokProvider exists, we join and get the credentials; when it doesn't, the join condition is always false so provider remains null.
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: GitHub Action <action@github.com>
…ion (anomalyco#5086) Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
… have sessions migrated (anomalyco#5105) Co-authored-by: GitHub Action <action@github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
…nomalyco#4978) Co-authored-by: noamzbr <noamzbr@users.noreply.github.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: rekram1-node <rekram1-node@users.noreply.github.com>
…mall timeout issue (anomalyco#5131)
Co-authored-by: Adam <2363879+adamdotdevin@users.noreply.github.com>
Resolved conflicts: - .github/workflows/duplicate-issues.yml: deleted (keep ours) - .github/workflows/publish.yml: deleted (keep ours) - STATS.md: accept upstream - bun.lock: regenerated - github/action.yml: keep fork-specific OPENCODE_BIN_PATH - packages/console/*/package.json: accept upstream versions - packages/console/app/src/routes/zen/util/handler.ts: accept upstream - packages/console/core/src/model.ts: accept upstream (byokProvider) - packages/desktop/package.json: accept upstream version - packages/enterprise/package.json: accept upstream version - packages/extensions/zed/extension.toml: accept upstream version - packages/function/package.json: accept upstream version - packages/opencode/package.json: accept upstream version - packages/opencode/src/agent/agent.ts: merge both (keep subagents + add maxSteps) - packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx: keep fork text getter - packages/opencode/src/cli/cmd/tui/routes/session/index.tsx: keep fork features - packages/opencode/src/provider/provider.ts: accept upstream sap-ai-core getModel - packages/opencode/src/tool/bash.ts: accept upstream - packages/plugin/package.json: accept upstream version - packages/sdk/js/package.json: accept upstream version - packages/slack/package.json: accept upstream version - packages/tauri/package.json: accept upstream version - packages/ui/package.json: accept upstream version - packages/util/package.json: accept upstream version - packages/web/package.json: accept upstream version - sdks/vscode/package.json: accept upstream version
|
Important Review skippedBot user detected. To trigger a single review, invoke the You can disable this status message by setting the Comment |
Collaborator
|
/oc resolve bun.lock conflict |
Collaborator
|
Closing as duplicate - upstream v1.0.134 was already merged via PR #90 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
18 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
All tasks completed successfully. Here's a summary of what was accomplished:
Summary
Successfully merged upstream
sst/opencodetag v1.0.134 into the shuvcode fork.Key Actions
Setup and fetch: Added upstream remote and fetched v1.0.134 tag
Merge conflicts resolved (29 files):
duplicate-issues.yml,publish.ymlbun installOPENCODE_BIN_PATHagent.ts: Merged both (kept subagents + added maxSteps)prompt/index.tsx: Kept fork's text gettersession/index.tsx: Kept fork's bashOutput and search featuresprovider.ts: Added upstream sap-ai-core getModelbash.ts: Accepted upstream message improvementsmodel.ts,handler.ts: Accepted upstream byokProvider changesValidation: Typecheck and tests passed (265 tests, 0 failures)
PR created: sync: merge upstream v1.0.134 #90
Closes #89
opencode session | github run