Skip to content

Upstream nightly v0.0.46-nightly.20261008.2849 conflicts with custom-nightly #68

Closed
#69
Closed
Upstream nightly v0.0.46-nightly.20261008.2849 conflicts with custom-nightly#68
#69
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 9, 2026

Merging upstream nightly v0.0.46-nightly.20261008.2849 from main into custom-nightly stopped on conflicts, so no custom build is published until they are resolved. Chamaquita resolves them and, because this issue carries automerge, merges its pull request once every check passes.

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

Conflicted files:

  • apps/server/package.json
  • pnpm-lock.yaml

Task

On every attempt, including the first, check your work locally before each push, because GitHub CI takes about 10 minutes to report:

  • Set up once per worktree: pnpm install --ignore-scripts, then pnpm exec effect-tsgo patch, which adds the Effect diagnostics CI enforces.
  • Run pnpm exec vp fmt <file>... and pnpm exec vp lint --report-unused-disable-directives <file>... on every file you resolved or changed.
  • Run pnpm exec tsc --noEmit --checkers 1 inside each of apps/desktop and packages/* whose files you resolved or changed.
  • Fix failures and rerun the affected check before pushing. Spend at most five minutes on setup and checks together.
  • Never typecheck apps/server or apps/web, run knip, test suites, or builds here: they need more than this machine's 4 GB, and GitHub CI runs them on the pull request. Name the checks you left to CI in your summary.
  1. Start chamaquita/upstream-v0.0.46-nightly.20261008.2849 from origin/custom-nightly, or continue it if an earlier attempt pushed it. Fetch the tag with git fetch --no-tags https://github.com/pingdotgg/t3code.git tag v0.0.46-nightly.20261008.2849 and merge it with git merge --no-ff v0.0.46-nightly.20261008.2849. Never rebase, squash, or cherry-pick: the nightly decides what is new with git merge-base --is-ancestor v0.0.46-nightly.20261008.2849 HEAD, 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.20261008.2849..origin/custom-nightly; upstream's is in git log origin/custom-nightly..v0.0.46-nightly.20261008.2849 and its pull requests.
    • Regenerate lockfiles and generated files instead of merging them by hand: take upstream's pnpm-lock.yaml and run pnpm install --ignore-scripts to reconcile it with the merged manifests.
    • Leave no conflict markers: git grep -nE '^(<<<<<<<|>>>>>>>) ' finds nothing.
  3. Commit the merge, push chamaquita/upstream-v0.0.46-nightly.20261008.2849, and open a pull request into custom-nightly. Its body has a table with one row per conflicted hunk 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.
  4. GitHub CI runs the fork's checks on the pull request. Chamaquita merges it as a merge commit once every check passes and GitHub finds it mergeable; if CI fails, Chamaquita hands the failures to the next attempt. The next run finds the tag merged, publishes the build, and closes this issue.

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

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

  2. chamaquita-d3 commented on Oct 9, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Oct 9, 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/1557916093799080110

  3. chamaquita-d3 commented on Oct 9, 2026

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

    Attempt 1 of 2: Claude Code finished, waiting for GitHub CI
    Resolved 2 conflicts. In apps/server/package.json, the fork's ai dependency and upstream's @t3tools/provider-core and @t3tools/provider-pi additions are disjoint, so I kept all three. For pnpm-lock.yaml I took upstream's file and ran pnpm install --ignore-scripts; the ai 7.0.111 entry is present. The tag is now an ancestor of HEAD, and no conflict markers remain. I ran vp fmt on package.json. No .ts files were resolved, so I ran no tsc or lint. I left typecheck of apps/server and apps/web, knip, tests and builds to CI. PR: #69
    Pull request: #69
    Branch: chamaquita/upstream-v0.0.46-nightly.20261008.2849
    Claude Code session: ada90cae-2400-4fbf-9130-a19f8e4ecfff
    Chamaquita merges it once GitHub CI passes on commit 284969f. If no check has started by 01:04 UTC, or some still run at 01:44 UTC, a person takes it from there.

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

  4. chamaquita-d3 commented on Oct 9, 2026

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

    Attempt 1 of 2 finished: flawed
    Resolved 2 conflicts. In apps/server/package.json, the fork's ai dependency and upstream's @t3tools/provider-core and @t3tools/provider-pi additions are disjoint, so I kept all three. For pnpm-lock.yaml I took upstream's file and ran pnpm install --ignore-scripts; the ai 7.0.111 entry is present. The tag is now an ancestor of HEAD, and no conflict markers remain. I ran vp fmt on package.json. No .ts files were resolved, so I ran no tsc or lint. I left typecheck of apps/server and apps/web, knip, tests and builds to CI. PR: #69
    Pull request: #69
    Branch: chamaquita/upstream-v0.0.46-nightly.20261008.2849
    Claude Code session: ada90cae-2400-4fbf-9130-a19f8e4ecfff
    GitHub CI failed on commit 284969f:

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

  5. chamaquita-d3 commented on Oct 9, 2026

    @chamaquita-d3
    chamaquita-d3bot
    on Oct 9, 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/1557916093799080110

  6. chamaquita-d3 commented on Oct 9, 2026

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

    Attempt 2 of 2: Claude Code finished, waiting for GitHub CI
    Pushed 1374d5a to PR #69, which is ready for review and says "Fixes #68".

    • Web build: upstream removed getDriverOption from providerDriverMeta.ts. UsageSidebarPanel.tsx, a fork file, still imported it. It now uses providerClients.get(driver)?.label, as upstream's ComposerUsageLimits does. I updated the mock in UsageSidebarPanel.refresh.test.tsx to match.
    • Desktop tests: two new upstream tests, in DesktopAppIdentity.test.ts and DesktopApplicationMenu.test.ts, expected "T3 Code" nightly names. The fork brands nightly builds as "D3 Code", so I changed the expected values to "D3 Code" for the Nightly stage. Alpha and Dev still expect "T3 Code".

    Checks I ran: vp fmt on the 4 changed files, and tsc --noEmit in apps/desktop, which was clean.

    Checks I did not finish: vp lint crashed on this machine with an oxc allocator panic, even with one thread. I did not typecheck apps/web. Lint, the web typecheck, the web build and the tests are left to CI.
    Pull request: #69
    Branch: chamaquita/upstream-v0.0.46-nightly.20261008.2849
    Claude Code session: dca5f3ad-572a-4f37-a573-fc5ec6269930
    Chamaquita merges it once GitHub CI passes on commit 1374d5a. If no check has started by 01:22 UTC, or some still run at 02:02 UTC, a person takes it from there.

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

  7. chamaquita-d3
    closed this as completedin #69on Oct 9, 2026

  8. chamaquita-d3 commented on Oct 9, 2026

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

    Attempt 2 of 2 finished: success
    Pushed 1374d5a to PR #69, which is ready for review and says "Fixes #68".

    • Web build: upstream removed getDriverOption from providerDriverMeta.ts. UsageSidebarPanel.tsx, a fork file, still imported it. It now uses providerClients.get(driver)?.label, as upstream's ComposerUsageLimits does. I updated the mock in UsageSidebarPanel.refresh.test.tsx to match.
    • Desktop tests: two new upstream tests, in DesktopAppIdentity.test.ts and DesktopApplicationMenu.test.ts, expected "T3 Code" nightly names. The fork brands nightly builds as "D3 Code", so I changed the expected values to "D3 Code" for the Nightly stage. Alpha and Dev still expect "T3 Code".

    Checks I ran: vp fmt on the 4 changed files, and tsc --noEmit in apps/desktop, which was clean.

    Checks I did not finish: vp lint crashed on this machine with an oxc allocator panic, even with one thread. I did not typecheck apps/web. Lint, the web typecheck, the web build and the tests are left to CI.
    Pull request: #69 (merged)
    Branch: chamaquita/upstream-v0.0.46-nightly.20261008.2849
    Claude Code session: dca5f3ad-572a-4f37-a573-fc5ec6269930
    GitHub CI passed on commit 1374d5a.
    Merged into custom-nightly as merge commit 88699a5, because the issue carries automerge and GitHub CI passed.

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

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