Upstream sync: 3 conflicts, branch push blocked (2026-04-28)

[Jesssullivan]

Upstream sync triage

Manual issue created after upstream-sync run 25029657728 completed its conflict path but could not create an issue from inside Actions.

Run: https://github.com/Jesssullivan/cmux/actions/runs/25029657728
Upstream SHA: fac0cccc992dab15c307068a0937cb3e4675b981
Upstream commits behind current fork: 24

Conflicted files

Resources/Info.plist
Sources/cmuxApp.swift
scripts/reload.sh

Branch push blocker

The workflow attempted to create upstream-sync/conflicts-20260428, but GitHub rejected the push because this upstream batch includes workflow-file changes and the workflow GITHUB_TOKEN cannot create or update .github/workflows/ci.yml.

The fallback gh issue create call also failed inside Actions with:

GraphQL: Resource not accessible by integration (createIssue)

Recent upstream commits

• fac0cccc Add copy ID actions to context menus
• 3b5ce50f Harden cloud VM production controls
• 3e687902 Add menu bar only mode
• 431d9350 Fix feedback editor scrolling (Fix feedback editor scrolling manaflow-ai/cmux#3182)
• 411130ef cmux vm: cloud VM backend and attach flows
• 379033c4 Refactor window backdrop policies (Refactor window backdrop policies manaflow-ai/cmux#3166)
• 36d41696 Address Greptile P1: surface lock-wait notice and rehash hint
• 72e0ebba fix: add AppleEvents privacy usage description
• 587abaf1 Quiet reload.sh: log to file, summary on success, dump on failure
• 5ea2c767 Add Release build guard to CI

Action required

Resolve the three conflicts locally or from an authorized user token with workflow scope, then verify fork-specific files and normal CI before merging.