Sync with upstream anomalyco/opencode (dev) - #9
Open
dannypaz wants to merge 87 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>
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Co-authored-by: Brendan Allan <git@brendonovich.dev>
Pulls in ~86 new commits from the upstream opencode project while
preserving all fork-specific changes (Electron auto-updater removal,
Sentry/OpenTelemetry/PostHog stripping, CLI self-upgrade removal,
session share feature removal, AWS Lambda MicroVMs cloud control
plane).
Resolved one conflict in packages/app/src/components/titlebar.tsx:
kept the fork's simplified TitlebarV2Right() (no props) instead of
upstream's TitlebarV2Right({state}) / v2RightState(), since that
upstream change wires the title bar to an "Update" pill tied to the
auto-update system this fork intentionally removed. Adopting it would
have reintroduced dead/broken references.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01QUTEPXcSbvKqm7D79a7Bkc
|
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
14 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.
Issue for this PR
N/A — scheduled upstream sync.
Type of change
What does this PR do?
Merges
anomalyco/opencode'sdevbranch (upstream) into this fork'sdevbranch, bringing in ~86 upstream commits while keeping every fork-specific change intact. No fork commits were dropped, rebased, or altered — this is a straight merge (git merge upstream/dev), so the fork's full commit history is preserved as-is and only new upstream work is layered on top.Fork-specific features/removals preserved by this merge (verified untouched, see below):
Merge conflicts
Exactly one textual conflict, in
packages/app/src/components/titlebar.tsx. Upstream changed the title bar's right-side region to acceptstate={v2RightState()}, wiring it to a new "Update" pill (TitlebarUpdatePillState) tied to upstream's in-app update/auto-updater flow. This fork already deleted that entire auto-update subsystem, sov2RightState/TitlebarUpdatePillStatedon't exist here.Resolution: kept this fork's version —
<TitlebarV2Right />(no props) plus the existingelectronWindows()/data-tauri-decorum-tbhandling. Taking upstream's line as-is would have reintroduced a reference to code this fork intentionally removed and broken the build. No fork behavior was changed to resolve this; the fork's simplified title bar is unchanged.Architectural / hard-to-resolve issues worth flagging
TitlebarUpdatePillState,v2RightState) on top of its auto-updater, which this fork removed. Every future upstream sync touchingtitlebar.tsx's right-hand region is likely to re-trigger this same conflict. There's no code action needed now, but it's worth deciding whether to permanently fork this component or periodically re-evaluate whether to re-adopt update UI (without the actual updater) as upstream evolves it.bun installin this sandbox failed fetching a GitHub-hosted dependency tarball (ghostty-web) with a 403, which is an environment/network-policy restriction unrelated to this merge — fullbun install/typecheck/ build could not be run here. Recommend runningbun install && bun run typechecklocally or in CI before merging to be safe, since this PR could not be fully build-verified in this environment.How did you verify your code works?
upstream/dev..dev) remain ancestors of the merge commit.sentry,opentelemetry,posthog,electron-updater/autoUpdater, session-share, and CLI self-upgrade identifiers to confirm none were reintroduced.Screenshots / recordings
N/A — no UI behavior change; the one hand-resolved conflict preserves the fork's existing title bar behavior exactly.
Checklist
anomalyco/opencode'sdev, plus one hand-resolved conflict)bun install/build in this sandbox (network-restricted); please verify CI is green before mergingGenerated by Claude Code