Skip to content

Upstream sync: anomalyco/opencode v1.19.5 into dev (conflicts) - #325

Merged
pminevp merged 14 commits into
devfrom
upstream-sync/v1.19.5
Nov 2, 2026
Merged

pminevp merged 14 commits into
devfrom
upstream-sync/v1.19.5

Conversation

@pminevp

@pminevp pminevp commented Nov 2, 2026

Copy link
Copy Markdown
Collaborator

Automated merge of anomalyco/opencode release tag v1.19.5 @ 810c0eba1a (XCOD-118).

Lunos follows upstream's v1 release tags: upstream dev is now v2, which is evaluated separately.

⚠️ Merge conflicts

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):

git fetch origin && git checkout upstream-sync/v1.19.5 && git merge origin/dev
# fix the files below, then record the upstream base and lag this build will report:
bun script/upstream-version.ts --upstream 810c0eba1a7348036f8bdf61e6632d0c36c6876c && bun script/upstream-sync.ts stamp --upstream 810c0eba1a7348036f8bdf61e6632d0c36c6876c
git add -A && git commit --no-edit && git push
  • .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/opencode/package.json
  • packages/opencode/script/publish.ts
  • packages/opencode/src/effect/bootstrap-runtime.ts
  • packages/opencode/src/installation/index.ts
  • script/publish.ts
  • sdks/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.yml

Version 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.yml
  • packages/desktop/package.json
  • packages/opencode/package.json
  • packages/opencode/script/publish.ts
  • packages/opencode/src/config/config.ts
  • packages/opencode/src/installation/index.ts
  • sdks/vscode/package.json

Merge with a merge commit, not squash or rebase: otherwise the upstream commits never reach dev and the lag doesn't fall.

Tests

Waiting for the test and typecheck runs on this branch.

Upstream commits (13)

@pminevp pminevp added the upstream-conflict Upstream sync PR with merge conflicts to resolve by hand (XCOD-118) label Nov 2, 2026
@pminevp
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
@pminevp
pminevp merged commit 22da85c into dev Nov 2, 2026
13 of 22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

upstream-conflict Upstream sync PR with merge conflicts to resolve by hand (XCOD-118)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants