Repository navigation
Upstream nightly v0.1.6-nightly.20261030.3904: make it merge and build on custom-nightly #194
Description
Upstream nightly v0.1.6-nightly.20261030.3904 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.6-nightly.20261030.3904
Upstream tag: v0.1.6-nightly.20261030.3904 from https://github.com/pingdotgg/t3code.git
Merging it stopped on conflicts in:
apps/server/src/preview/ServerBrowser.tsapps/server/src/preview/ServerBrowserContexts.tsapps/web/src/components/chat/TimelineUserMessageRow.tsx
Task
- Start
chamaquita/upstream-v0.1.6-nightly.20261030.3904fromorigin/custom-nightly, or continue it if an earlier attempt pushed it. Ifgit merge-base --is-ancestor v0.1.6-nightly.20261030.3904 HEADfails, fetch the tag withgit fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.1.6-nightly.20261030.3904and merge it withgit merge --no-ff v0.1.6-nightly.20261030.3904. 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. - 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.6-nightly.20261030.3904..origin/custom-nightly; upstream's is ingit log origin/custom-nightly..v0.1.6-nightly.20261030.3904and its pull requests. - Take upstream's
pnpm-lock.yamland runpnpm install --ignore-scriptsto reconcile it with the merged manifests.
- 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.
- Push
chamaquita/upstream-v0.1.6-nightly.20261030.3904and open a pull request intocustom-nightly. Its body starts withCloses #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. - 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/41011462117
Activity
chamaquita-d3 commentedon Oct 30, 2026
Chamaquita started Attempt 1 of 2 on this issue, stamped by github-actions[bot], the repository's GitHub Actions.
automergestamped by github-actions[bot], the repository's GitHub Actions. Follow it in Discord: https://discord.com/channels/1497356507472466022/1564056102197403689chamaquita-d3 commentedon Oct 30, 2026
Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
Merged tag v0.1.6-nightly.20261030.3904 with a merge commit, so the tag is an ancestor of the branch. I resolved three conflicted files, keeping the fork's changes and taking upstream's. In ServerBrowser.ts, the fork's system-browser executable and diagnose logic now sit next to upstream's new agent-scope launcher. In ServerBrowserContexts.ts, the fork's GPU probe now goes through upstream's new launch(executable, start) signature, so the probe also uses the launcher. In TimelineUserMessageRow.tsx, the fork's glass bubble applies only when the message isn't media-only, which is upstream's new rule. I took upstream's pnpm-lock.yaml and reconciled it with pnpm install --ignore-scripts. I ran no builds or tests locally, so the checks on PR #195 are the first typecheck and build of this merge.
Pull request: #195
Branch:
chamaquita/upstream-v0.1.6-nightly.20261030.3904Claude Code session:
007b4936-49bd-42b0-9cdb-6084afe31fdeChamaquita merges it once GitHub CI passes on commit 89309af. If no check has started by 06:11 UTC, or some still run at 06:31 UTC, a person takes it from there.
In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1565606199272022107
chamaquita-d3 commentedon Oct 30, 2026
Attempt 1 of 2 finished: success
Merged tag v0.1.6-nightly.20261030.3904 with a merge commit, so the tag is an ancestor of the branch. I resolved three conflicted files, keeping the fork's changes and taking upstream's. In ServerBrowser.ts, the fork's system-browser executable and diagnose logic now sit next to upstream's new agent-scope launcher. In ServerBrowserContexts.ts, the fork's GPU probe now goes through upstream's new launch(executable, start) signature, so the probe also uses the launcher. In TimelineUserMessageRow.tsx, the fork's glass bubble applies only when the message isn't media-only, which is upstream's new rule. I took upstream's pnpm-lock.yaml and reconciled it with pnpm install --ignore-scripts. I ran no builds or tests locally, so the checks on PR #195 are the first typecheck and build of this merge.
Pull request: #195 (merged)
Branch:
chamaquita/upstream-v0.1.6-nightly.20261030.3904Claude Code session:
007b4936-49bd-42b0-9cdb-6084afe31fdeGitHub CI passed on commit 89309af.
Merged into
custom-nightlyas merge commit 77a5e66, because the issue carriesautomergeand GitHub CI passed.In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1565606199272022107