Upstream nightly v0.1.4-nightly.20261028.3841: make it merge and build on custom-nightly #188

Upstream nightly v0.1.4-nightly.20261028.3841 from main does not yet merge and build on custom-nightly, so no custom build is published. Chamaquita fixes it and, because this issue carries automerge, merges her pull request once its checks pass.

Base branch: custom-nightly
Job branch: chamaquita/upstream-v0.1.4-nightly.20261028.3841
Upstream tag: v0.1.4-nightly.20261028.3841 from https://github.com/pingdotgg/t3code.git

Merging it stopped on conflicts in:

• apps/server/src/settingsSecrets.ts

Task

1. Start chamaquita/upstream-v0.1.4-nightly.20261028.3841 from origin/custom-nightly, or continue it if an earlier attempt pushed it. If git merge-base --is-ancestor v0.1.4-nightly.20261028.3841 HEAD fails, fetch the tag with git fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.1.4-nightly.20261028.3841 and merge it with git merge --no-ff v0.1.4-nightly.20261028.3841. Never rebase, squash, or cherry-pick: the nightly decides what is merged with that ancestor check, so only a merge commit keeps the tag an ancestor.
2. Resolve each conflicted hunk:
   • Classify it as disjoint (the sides changed different things, so keep both), same question with different answers (pick one side on the evidence), or superseded (one side's change makes the other's moot).
   • Touch only the conflicted regions, and leave every line git merged cleanly as it is.
   • Keep the fork's customizations and take upstream's changes. The fork's intent is in git log v0.1.4-nightly.20261028.3841..origin/custom-nightly; upstream's is in git log origin/custom-nightly..v0.1.4-nightly.20261028.3841 and its pull requests.
   • Take upstream's pnpm-lock.yaml and run pnpm install --ignore-scripts to reconcile it with the merged manifests.
3. Fix whatever stops it building. Upstream moves and renames code without conflicts, so adapt the fork's code to upstream's changes rather than editing upstream files. If the failure is not in the code, such as a missing secret, code signing, or a runner problem, change nothing and finish blocked with the reason.
4. Push chamaquita/upstream-v0.1.4-nightly.20261028.3841 and open a pull request into custom-nightly. Its body starts with Closes # and this issue's number, then has a table with one row per conflicted hunk or fix and the columns File:lines, Class, custom-nightly, Upstream, Kept, and Why. If a push is refused for the workflows permission, change nothing and finish blocked with that reason.
5. Fork CI on the pull request typechecks and builds the desktop app. Chamaquita merges it once that passes, and the next nightly run publishes the build.

Run: https://github.com/d3labs-dev/t3code/actions/runs/40769651509