Skip to content

Upstream nightly v0.1.1-nightly.20261020.3411: make it merge and build on custom-nightly #129

Closed
#130
Closed
Upstream nightly v0.1.1-nightly.20261020.3411: make it merge and build on custom-nightly#129
#130
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 20, 2026

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

Merging it stopped on conflicts in:

  • apps/mobile/src/features/agent-awareness/remoteRegistration.ts
  • apps/mobile/src/features/workspace/AndroidWorkspaceNavigation.android.tsx
  • apps/mobile/src/features/workspace/android-workspace-navigation-colors.test.ts
  • apps/mobile/src/features/workspace/android-workspace-navigation-colors.ts
  • apps/mobile/src/widgets/SubscriptionUsageCoordinator.tsx
  • apps/mobile/src/widgets/subscriptionUsageSnapshot.test.ts
  • apps/server/src/environment/ServerEnvironment.ts
  • apps/server/src/settingsSecrets.ts
  • apps/server/src/usage/UsageLimitSources.ts
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • packages/contracts/src/keybindings.test.ts
  • packages/shared/package.json
  • packages/shared/src/cliRelease.ts
  • pnpm-lock.yaml
  • scripts/build-desktop-artifact.test.ts
  • scripts/build-desktop-artifact.ts
  • scripts/lib/brand-assets.test.ts

Task

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

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

  2. chamaquita-d3 commented on Oct 20, 2026

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

  3. chamaquita-d3 commented on Oct 20, 2026

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

    Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
    I merged the tag with git merge --no-ff, so it is an ancestor of the branch. I resolved the 19 conflicted files, keeping the fork's customizations alongside upstream's changes. Upstream deliberately removed some code, and I took upstream's side there. That covers the duplicate keybinding test, the brand-assets test, and the composer-overlay mask in MessagesTimeline, which upstream reverted in pingdotgg#22227. I took upstream's pnpm-lock.yaml and ran pnpm install --ignore-scripts to reconcile it with the merged manifests. As instructed, I ran no builds, typechecks or tests, so any build breakage that git merged without a conflict will only show up in CI. PR #130 starts with Closes #129 and has the per-hunk table (File:lines, Class, custom-nightly, Upstream, Kept, Why).
    Pull request: #130
    Branch: chamaquita/upstream-v0.1.1-nightly.20261020.3411
    Claude Code session: 73e9aae5-44c9-42bc-b127-ef8b86ffcdce
    Chamaquita merges it once GitHub CI passes on commit b71eccf. If no check has started by 15:40 UTC, or some still run at 16:00 UTC, a person takes it from there.

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

  4. chamaquita-d3 commented on Oct 20, 2026

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

    Attempt 1 of 2 finished: flawed
    I merged the tag with git merge --no-ff, so it is an ancestor of the branch. I resolved the 19 conflicted files, keeping the fork's customizations alongside upstream's changes. Upstream deliberately removed some code, and I took upstream's side there. That covers the duplicate keybinding test, the brand-assets test, and the composer-overlay mask in MessagesTimeline, which upstream reverted in pingdotgg#22227. I took upstream's pnpm-lock.yaml and ran pnpm install --ignore-scripts to reconcile it with the merged manifests. As instructed, I ran no builds, typechecks or tests, so any build breakage that git merged without a conflict will only show up in CI. PR #130 starts with Closes #129 and has the per-hunk table (File:lines, Class, custom-nightly, Upstream, Kept, Why).
    Pull request: #130
    Branch: chamaquita/upstream-v0.1.1-nightly.20261020.3411
    Claude Code session: 73e9aae5-44c9-42bc-b127-ef8b86ffcdce
    GitHub CI failed on commit b71eccf:

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

  5. chamaquita-d3 commented on Oct 20, 2026

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

    Chamaquita started Attempt 2 of 2 on this issue because GitHub CI failed on its pull request. Follow it in Discord: https://discord.com/channels/1497356507472466022/1562124435555745802

  6. chamaquita-d3 commented on Oct 20, 2026

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

    Attempt 2 of 2: Claude Code finished, waiting for GitHub CI
    The failing check reported one error. A test in android-workspace-navigation-colors.test.ts (the phone-background case) called androidWorkspaceNavigationColors without the rail argument, which the merged function now requires. I added rail: false, since that case is the non-rail one, and pushed commit db6bb57 to chamaquita/upstream-v0.1.1-nightly.20261020.3411. I ran no checks or tests locally, as instructed. The other CI lines in the log were only Effect suggestions, not errors. PR #130 (#130) already starts with Closes #129 and has the per-hunk table.
    Pull request: #130
    Branch: chamaquita/upstream-v0.1.1-nightly.20261020.3411
    Claude Code session: 6c2979a7-bc8e-469a-a69e-6974a22c8e59
    Chamaquita merges it once GitHub CI passes on commit db6bb57. If no check has started by 15:43 UTC, or some still run at 16:03 UTC, a person takes it from there.

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

  7. chamaquita-d3 commented on Oct 20, 2026

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

    Attempt 2 of 2 finished: flawed
    The failing check reported one error. A test in android-workspace-navigation-colors.test.ts (the phone-background case) called androidWorkspaceNavigationColors without the rail argument, which the merged function now requires. I added rail: false, since that case is the non-rail one, and pushed commit db6bb57 to chamaquita/upstream-v0.1.1-nightly.20261020.3411. I ran no checks or tests locally, as instructed. The other CI lines in the log were only Effect suggestions, not errors. PR #130 (#130) already starts with Closes #129 and has the per-hunk table.
    Pull request: #130
    Branch: chamaquita/upstream-v0.1.1-nightly.20261020.3411
    Claude Code session: 6c2979a7-bc8e-469a-a69e-6974a22c8e59
    GitHub CI failed on commit db6bb57:

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

  8. diegojohnsonl
    closed this as completedin #130on Oct 20, 2026
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