Skip to content

Upstream sync: anomalyco/opencode dev into dev (2026-09-27) (conflicts) - #70

Merged
pminevp merged 65 commits into
devfrom
upstream-sync/2026-09-27
Sep 27, 2026
Merged

pminevp merged 65 commits into
devfrom
upstream-sync/2026-09-27

Conversation

@pminevp

@pminevp pminevp commented Sep 27, 2026 •

Copy link
Copy Markdown
Collaborator

Automated merge of anomalyco/opencode dev @ b471c2b449 (XCOD-118).

⚠️ 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/2026-09-27 && git merge origin/dev
# fix the files below, then record the upstream base and lag this build will report:
bun script/upstream-version.ts && bun script/upstream-sync.ts stamp --upstream b471c2b4495747353af768fbf2e0790c9d820ce2
git add -A && git commit --no-edit && git push
  • .github/workflows/duplicate-issues.yml
  • .github/workflows/triage.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/src/cli/cmd/debug/config.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
  • packages/web/src/content/docs/ecosystem.mdx
  • 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-bun/action.yml
  • 🔴 .github/workflows/duplicate-issues.yml
  • 🔴 .github/workflows/models-snapshot.yml
  • 🔴 .github/workflows/triage.yml

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-bun/action.yml
  • .github/workflows/duplicate-issues.yml
  • .github/workflows/models-snapshot.yml
  • .github/workflows/triage.yml
  • packages/core/src/npm.ts
  • packages/opencode/package.json
  • packages/opencode/src/plugin/digitalocean.ts
  • packages/opencode/src/plugin/openai/codex.ts
  • packages/opencode/src/plugin/snowflake-cortex.ts

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

Tests

Upstream commits (63)

MrMushrooooom and others added 30 commits September 18, 2026 17:13
opencode-agent Bot and others added 25 commits September 22, 2026 18:38
@pminevp pminevp added the upstream-conflict Upstream sync PR with merge conflicts to resolve by hand (XCOD-118) label Sep 27, 2026
pminev1 and others added 2 commits September 27, 2026 13:07
Brings Lunos up to date with anomalyco/opencode dev @ b471c2b (63 commits, 9 days).

Conflicts resolved:
- 29 package.json files: Lunos's version lines (1.18.40) and VS Code extension identity; upstream's
  dependency bumps (@ai-sdk/togetherai 2.0.68, gitlab-ai-provider 6.18.0, open 11.0.4) kept.
- debug/config.ts: upstream's credential redaction (anomalyco#50956) combined with Lunos's drain-safe
  output (XCOD-77) and --sources (XCOD-102).
- triage.yml, duplicate-issues.yml: stay deleted (XCOD-18).
- docs/ecosystem.mdx: upstream's (the Lunos docs build excludes this page, XCOD-124).
- bun.lock: regenerated; nix/hashes.json: Lunos's, recomputed by nix-hashes on dev.
- lunos.upstreamVersion 1.18.32, upstreamSync stamped (0 days behind at this commit).

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
…unos docs

Upstream's PageFrame (6da6d47) adds a banner on every page linking to opencode.ai/v2; the
docs-lunos branding check caught it in this sync. The Lunos Starlight wrapper uses Starlight's own
PageFrame and removes the space reserved for the banner; upstream's files are unchanged.

Co-Authored-By: Claude Opus 5.5 (1M context) <[email protected]>
@pminevp
pminevp marked this pull request as ready for review September 27, 2026 10:08
@pminevp
pminevp merged commit 78a091c into dev Sep 27, 2026
5 of 9 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.