Repository navigation
Upstream sync: anomalyco/opencode v1.19.5 into dev (conflicts) - #325
Merged
Merged
Conversation
Co-authored-by: jlongster <17031+jlongster@users.noreply.github.com> Co-authored-by: James Long <longster@gmail.com>
…nomalyco#54936) Co-authored-by: James Long <longster@gmail.com>
pminevp
marked this pull request as ready for review
November 2, 2026 15:07
# Conflicts: # .github/actions/setup-git-committer/action.yml # .github/workflows/containers.yml # .github/workflows/generate.yml # .github/workflows/nix-hashes.yml # .github/workflows/publish-vscode.yml # .github/workflows/publish.yml # bun.lock # nix/hashes.json # packages/app/package.json # packages/cli/package.json # packages/codemode/package.json # packages/console/app/package.json # packages/console/core/package.json # packages/console/function/package.json # packages/console/mail/package.json # packages/console/support/package.json # packages/core/package.json # packages/desktop/package.json # packages/effect-drizzle-sqlite/package.json # packages/effect-sqlite-node/package.json # packages/enterprise/package.json # packages/function/package.json # packages/http-recorder/package.json # packages/llm/package.json # packages/opencode/package.json # packages/opencode/script/publish.ts # packages/opencode/src/effect/bootstrap-runtime.ts # packages/opencode/src/installation/index.ts # packages/plugin/package.json # packages/sdk/js/package.json # packages/server/package.json # packages/session-ui/package.json # packages/slack/package.json # packages/stats/app/package.json # packages/stats/core/package.json # packages/stats/server/package.json # packages/tui/package.json # packages/ui/package.json # packages/web/package.json # script/publish.ts # sdks/vscode/package.json
This was referenced Nov 5, 2026
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
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.
Automated merge of
anomalyco/opencoderelease tagv1.19.5@810c0eba1a(XCOD-118).Lunos follows upstream's v1 release tags: upstream
devis now v2, which is evaluated separately.This branch is the upstream tip, not a merge: the workflow never resolves conflicts. Resolve it
with a normal merge commit (never squash or rebase, or upstream drops out of
dev's history):.github/actions/setup-git-committer/action.yml.github/workflows/containers.yml.github/workflows/generate.yml.github/workflows/nix-hashes.yml.github/workflows/publish-vscode.yml.github/workflows/publish.ymlbun.locknix/hashes.jsonpackages/opencode/package.jsonpackages/opencode/script/publish.tspackages/opencode/src/effect/bootstrap-runtime.tspackages/opencode/src/installation/index.tsscript/publish.tssdks/vscode/package.json🔴 Upstream changed CI or release plumbing
Check each of these before merging: the fork's workflows differ from upstream on purpose.
.github/actions/setup-git-committer/action.yml.github/workflows/bot-nix-hashes.yml.github/workflows/check-bot-scope.yml.github/workflows/containers.yml.github/workflows/docs-locale-sync.yml.github/workflows/generate.yml.github/workflows/models-snapshot.yml.github/workflows/nix-hashes.yml.github/workflows/publish-github-action.yml(release workflow).github/workflows/publish-vscode.yml(release workflow).github/workflows/publish.yml(release workflow).github/workflows/typecheck.yml.github/workflows/unlock.ymlVersion lines kept automatically
Only the
"version"line conflicted in 27 package.json files; the workflow kept Lunos's version in each (the one conflict it resolves by itself). Everything else in those files merged normally.Lunos-owned paths touched by upstream
Upstream changed files that Lunos has modified on purpose (
.github/lunos-owned-paths). Review these by hand, even if the merge is clean..github/actions/setup-git-committer/action.yml.github/workflows/bot-nix-hashes.yml.github/workflows/check-bot-scope.yml.github/workflows/containers.yml.github/workflows/docs-locale-sync.yml.github/workflows/generate.yml.github/workflows/models-snapshot.yml.github/workflows/nix-hashes.yml.github/workflows/publish-github-action.yml.github/workflows/publish-vscode.yml.github/workflows/publish.yml.github/workflows/typecheck.yml.github/workflows/unlock.ymlpackages/desktop/package.jsonpackages/opencode/package.jsonpackages/opencode/script/publish.tspackages/opencode/src/config/config.tspackages/opencode/src/installation/index.tssdks/vscode/package.jsonMerge with a merge commit, not squash or rebase: otherwise the upstream commits never reach
devand the lag doesn't fall.Tests
Waiting for the
testandtypecheckruns on this branch.Upstream commits (13)