Skip to content

Upstream nightly v0.1.6-nightly.20261030.3940: make it merge and build on custom-nightly #198

Closed
#199
Closed
Upstream nightly v0.1.6-nightly.20261030.3940: make it merge and build on custom-nightly#198
#199
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 30, 2026

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

Merging it stopped on conflicts in:

  • apps/desktop/src/ipc/channels.ts
  • apps/desktop/src/preload.ts
  • apps/web/src/components/AppSidebarLayout.tsx
  • apps/web/src/components/chat/TimelineUserMessageRow.tsx
  • packages/contracts/src/ipc.ts

Task

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

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 30, 2026

  2. chamaquita-d3 commented on Oct 30, 2026

    @chamaquita-d3
    chamaquita-d3Bot
    on Oct 30, 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/1564056102197403689

  3. chamaquita-d3 commented on Oct 30, 2026

    @chamaquita-d3
    chamaquita-d3Bot
    on Oct 30, 2026

    Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
    I merged the upstream tag with a merge commit, so the tag is now an ancestor of the branch. All five conflicted files were resolved by keeping both sides: the desktop IPC channels, the preload bridge, the contracts DesktopBridge type and the sidebar layout (fork's dictation, dock-mood and SidebarPeek plus upstream's trackpad-scroll-begin and HistorySwipeNavigation). In TimelineUserMessageRow I took upstream's refactor (mediaBlock and the file-card/audio-only conditions) and reapplied the fork's surface-glass styling on the bubble and the image tiles. I took upstream's pnpm-lock.yaml and ran pnpm install --ignore-scripts. I ran tsc --noEmit directly in web, desktop, mobile and relay, and each exited 0. The aggregate pnpm run typecheck exited non-zero without printing an error, so I ran those four packages separately instead. Fork CI on the PR is the check for the build.
    Pull request: #199
    Branch: chamaquita/upstream-v0.1.6-nightly.20261030.3940
    Claude Code session: b6954554-2e62-4e5a-a5ed-4f1bc0c50625
    Chamaquita merges it once GitHub CI passes on commit e367b65. If no check has started by 23:00 UTC, or some still run at 23:20 UTC, a person takes it from there.

    In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1565858173133393935

  4. chamaquita-d3
    closed this as completedin #199on Oct 30, 2026

  5. chamaquita-d3 commented on Oct 30, 2026

    @chamaquita-d3
    chamaquita-d3Bot
    on Oct 30, 2026

    Attempt 1 of 2 finished: success
    I merged the upstream tag with a merge commit, so the tag is now an ancestor of the branch. All five conflicted files were resolved by keeping both sides: the desktop IPC channels, the preload bridge, the contracts DesktopBridge type and the sidebar layout (fork's dictation, dock-mood and SidebarPeek plus upstream's trackpad-scroll-begin and HistorySwipeNavigation). In TimelineUserMessageRow I took upstream's refactor (mediaBlock and the file-card/audio-only conditions) and reapplied the fork's surface-glass styling on the bubble and the image tiles. I took upstream's pnpm-lock.yaml and ran pnpm install --ignore-scripts. I ran tsc --noEmit directly in web, desktop, mobile and relay, and each exited 0. The aggregate pnpm run typecheck exited non-zero without printing an error, so I ran those four packages separately instead. Fork CI on the PR is the check for the build.
    Pull request: #199 (merged)
    Branch: chamaquita/upstream-v0.1.6-nightly.20261030.3940
    Claude Code session: b6954554-2e62-4e5a-a5ed-4f1bc0c50625
    GitHub CI passed on commit e367b65.
    Merged into custom-nightly as merge commit 30fb193, because the issue carries automerge and GitHub CI passed.

    In Discord: https://discord.com/channels/1497356507472466022/1564056102197403689/1565858173133393935

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