Skip to content

Upstream nightly v0.0.46-nightly.20261010.2908: make it merge and build on custom-nightly #72

Closed
#73
Closed
Upstream nightly v0.0.46-nightly.20261010.2908: make it merge and build on custom-nightly#72
#73
Labels
automergeChamaquita merges the Job's pull request once its checks passchamaquitaChamaquita works this issue as a Job

Description

@github-actions
github-actions
bot
opened on Oct 10, 2026

Upstream nightly v0.0.46-nightly.20261010.2908 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.0.46-nightly.20261010.2908
Upstream tag: v0.0.46-nightly.20261010.2908 from https://github.com/pingdotgg/t3code.git

Merging it stopped on conflicts in:

  • apps/desktop/src/ipc/DesktopIpcHandlers.ts
  • apps/mobile/src/App.tsx
  • apps/server/package.json
  • apps/server/src/provider/acp/AcpSessionRuntime.processTree.test.ts
  • apps/server/src/server.ts
  • apps/web/src/components/chat/ChatComposer.tsx
  • pnpm-lock.yaml
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts

Task

  1. Start chamaquita/upstream-v0.0.46-nightly.20261010.2908 from origin/custom-nightly, or continue it if an earlier attempt pushed it. If git merge-base --is-ancestor v0.0.46-nightly.20261010.2908 HEAD fails, fetch the tag with git fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.0.46-nightly.20261010.2908 and merge it with git merge --no-ff v0.0.46-nightly.20261010.2908. 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.0.46-nightly.20261010.2908..origin/custom-nightly; upstream's is in git log origin/custom-nightly..v0.0.46-nightly.20261010.2908 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.0.46-nightly.20261010.2908 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/38018299739

Activity

  1. github-actions
    added
    chamaquitaChamaquita works this issue as a Job
    automergeChamaquita merges the Job's pull request once its checks pass
    on Oct 10, 2026

  2. chamaquita-d3 commented on Oct 10, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Oct 10, 2026

    Chamaquita started Attempt 1 of 2 on this issue, stamped by github-actions[bot], the repository's GitHub Actions. automerge stamped by github-actions[bot], the repository's GitHub Actions. Follow it in Discord: https://discord.com/channels/1497356507472466022/1558310308181839943

  3. chamaquita-d3 commented on Oct 10, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Oct 10, 2026

    Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
    I merged the tag with --no-ff, so it stays an ancestor of the branch. I kept the fork's customizations and took upstream's changes, and the table in the PR body gives one row per conflicted hunk or fix.

    • Conflict resolutions:
      • Most hunks were disjoint, so I kept both sides (desktop IPC, mobile App.tsx, server.ts, ChatComposer, package.json).
      • In the ACP process-tree test I took upstream's pid base.
      • In build-desktop-artifact.ts I combined the fork's always-on mic entitlement with upstream's profile-derived passkey entitlements.
    • Lockfile: I took upstream's pnpm-lock.yaml and reconciled it with pnpm install --ignore-scripts.
    • Fixes after the merge:
      • dockMood.ts imported the old @t3tools/shared/hostProcess path, which upstream renamed to HostProcess.
      • The fork's tombstone pids in the process-tree test referred to a variable the merge dropped, so I pointed them at parentPidBase.
    • Checks I ran: tsc --noEmit passes for scripts, server, desktop, web and mobile, and scripts/build-desktop-artifact.test.ts passes (78 tests). I did not run the full suite or the desktop build, which are left to fork CI.

    PR: #73
    Pull request: #73
    Branch: chamaquita/upstream-v0.0.46-nightly.20261010.2908
    Claude Code session: 55ed0a05-7331-418d-b938-c0b5123a7d1d
    Chamaquita merges it once GitHub CI passes on commit 2f84cd9. If no check has started by 03:05 UTC, or some still run at 03:25 UTC, a person takes it from there.

    Discord thread: https://discord.com/channels/1497356507472466022/1558310308181839943

  4. chamaquita-d3
    closed this as completedin #73on Oct 10, 2026

  5. chamaquita-d3 commented on Oct 10, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Oct 10, 2026

    Attempt 1 of 2 finished: success
    I merged the tag with --no-ff, so it stays an ancestor of the branch. I kept the fork's customizations and took upstream's changes, and the table in the PR body gives one row per conflicted hunk or fix.

    • Conflict resolutions:
      • Most hunks were disjoint, so I kept both sides (desktop IPC, mobile App.tsx, server.ts, ChatComposer, package.json).
      • In the ACP process-tree test I took upstream's pid base.
      • In build-desktop-artifact.ts I combined the fork's always-on mic entitlement with upstream's profile-derived passkey entitlements.
    • Lockfile: I took upstream's pnpm-lock.yaml and reconciled it with pnpm install --ignore-scripts.
    • Fixes after the merge:
      • dockMood.ts imported the old @t3tools/shared/hostProcess path, which upstream renamed to HostProcess.
      • The fork's tombstone pids in the process-tree test referred to a variable the merge dropped, so I pointed them at parentPidBase.
    • Checks I ran: tsc --noEmit passes for scripts, server, desktop, web and mobile, and scripts/build-desktop-artifact.test.ts passes (78 tests). I did not run the full suite or the desktop build, which are left to fork CI.

    PR: #73
    Pull request: #73 (merged)
    Branch: chamaquita/upstream-v0.0.46-nightly.20261010.2908
    Claude Code session: 55ed0a05-7331-418d-b938-c0b5123a7d1d
    GitHub CI passed on commit 2f84cd9.
    Merged into custom-nightly as merge commit 64115b6, because the issue carries automerge and GitHub CI passed.

    Discord thread: https://discord.com/channels/1497356507472466022/1558310308181839943

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Metadata

Metadata

Assignees

No one assigned

    Labels

    automergeChamaquita merges the Job's pull request once its checks passchamaquitaChamaquita works this issue as a Job

    Type

    No type

    Projects

    No projects

      Milestone

      No milestone

      Relationships

      None yet

      Development

      No branches or pull requests

      Issue actions