T3-Turbo nightly rebase needs review

• Previous official nightly: v0.0.32-nightly.20260803.986 (30c96228067bcd3a49e432ec898e52d4acb04297)
• Candidate official nightly: v0.0.32-nightly.20260805.1002.turbo.1 (official v0.0.32-nightly.20260805.1002 plus upstream main) (3d429662c9bd7b731c059dc3a84ccdfc43bf3701)

The automation stopped without resolving or publishing anything.

Files changed by both upstream and Turbo

• apps/desktop/src/app/DesktopEnvironment.ts
• apps/desktop/src/settings/DesktopAppSettings.test.ts
• apps/server/src/auth/RpcAuthorization.ts
• apps/server/src/server.test.ts
• apps/server/src/ws.ts
• apps/web/index.html
• apps/web/src/components/ChatView.tsx
• packages/contracts/src/ipc.ts
• packages/contracts/src/rpc.ts
• scripts/build-desktop-artifact.ts

Unmerged paths reported by Git

• apps/desktop/src/app/DesktopEnvironment.ts

Rebase error

Rebasing (1/19)
Rebasing (2/19)
error: could not apply f9df66c0... feat(desktop): add T3 Turbo environment switching
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply f9df66c0... # feat(desktop): add T3 Turbo environment switching

Review and retry

• Open this Actions run
• Open the manual build page
• CLI retry: gh workflow run turbo-nightly-sync.yml -R gfsaaser24/t3code --ref main