Sync fork with upstream anomalyco/opencode (134 commits) - #10
Open
dannypaz wants to merge 135 commits into
Open
Conversation
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com>
Co-authored-by: opencode <noreply@opencode.ai>
…nomalyco#38119) Co-authored-by: Brendan Allan <git@brendonovich.dev> Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com>
Co-authored-by: Jack <jack@anoma.ly>
Co-authored-by: Aiden Cline <rekram1-node@users.noreply.github.com> Co-authored-by: Aiden Cline <aidenpcline@gmail.com>
…erg-mg1jhc # Conflicts: # packages/app/src/components/settings-v2/general.tsx # packages/app/src/components/titlebar.tsx # packages/desktop/electron-builder.config.ts # packages/desktop/src/main/index.ts
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
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.
Issue for this PR
N/A — scheduled upstream sync, not tied to an issue.
Type of change
What does this PR do?
Merges
upstream/dev(anomalyco/opencode, 134 commits, 2026-07-21 through 2026-07-29) into this fork'sdev, on top of the fork's 17 existing commits. No fork-specific commits or features were removed — this is a forward merge that pulls in new upstream code while preserving everything the fork has already changed or removed.Note: the task that requested this named the upstream repo as
opencode/opencode, but that org doesn't exist on GitHub. The project's own README, CONTRIBUTING.md, and install script all point toanomalyco/opencodeas the real upstream, so that's what was fetched and merged.Four real content conflicts came up during the merge, all resolved by hand:
packages/app/src/components/settings-v2/general.tsx— kept the fork's version. Upstream refactored this file to pull settings logic out into a newgeneral-controllers.tsmodule, but that refactor's only user-facing addition is an "check for updates" button, which conflicts with this fork's removal of the auto-update feature. The fork's inline version already covers every other setting (theme, shell, sounds, appearance, permissions) that the new controllers module provides.packages/app/src/components/titlebar.tsx— kept the fork's version of theTitlebarV2Rightrender call (and itsdata-tauri-decorum-tbWindows/Tauri handling, which upstream dropped in the same refactor). Upstream's side only differed by wiring inv2RightState(), which feeds the same removed update-check UI.packages/desktop/electron-builder.config.ts— combined both sides: kept upstream's newmetainfoFpm(appId)addition to the Linuxdeb/rpmpackaging (an unrelated AppStream metainfo fix, unrelated to updates), but dropped the newpublish: { provider: "github", ... }blocks, since those wire up electron-builder's auto-update publishing, which this fork has removed.packages/desktop/src/main/index.ts— both sides added an unrelated constant in the same spot (fork'sNETLOG_ENABLEDopt-in flag, upstream'sSIDECAR_VERSIONflag). Kept both; each is used elsewhere in the file.Major architectural notes (please read)
This fork has removed several features that upstream continues to actively build on top of: session sharing, OpenTelemetry, Sentry crash reporting, CLI self-upgrade/version-check, PostHog download stats, and the Electron auto-updater. All four conflicts above trace back to that last one (the auto-updater). As upstream keeps extending update-related UI and packaging, expect this same set of files to conflict again on the next sync, and expect the conflict surface to grow if upstream builds more on top of session sharing, telemetry, or the CLI upgrade path.
Specifically worth a maintainer's attention:
settings-v2/general.tsxinto ageneral-controllers.ts+general-controller-behavior.tsarchitecture (new files, merged in cleanly, currently unused by the fork). The fork'sgeneral.tsxwas kept in its pre-refactor, inline form. If the fork wants to stay aligned with upstream's settings architecture going forward, someone should deliberately migrategeneral.tsxonto the new controllers rather than let the fork's copy keep diverging.bun install/ typecheck / build in this sandbox — the environment's network egress policy blocksgithub.laiyagushi.com/ghapi(used to fetch agithub:dependency,ghostty-web), so dependency installation fails here. The conflict resolutions above were reviewed by hand and cross-checked against both branch histories, but CI should be treated as the real verification step for this PR before merging.How did you verify your code works?
Reviewed each conflicting hunk against both branches' full file contents and git history to confirm intent, then verified no leftover conflict markers and no reintroduction of removed features (share, OpenTelemetry, Sentry, auto-updater, self-upgrade) anywhere in the merged tree. Could not run install/build/tests locally due to sandbox network restrictions (see above) — relying on CI.
Screenshots / recordings
N/A — no UI behavior change beyond what's inherent to the upstream merge.
Checklist
Generated by Claude Code