Skip to content

chore(sync): merge pingdotgg/t3code main - #375

Merged
Yarden-zamir merged 6 commits into
mainfrom
fork-sync/2026-10-26-1709
Oct 26, 2026
Merged

Yarden-zamir merged 6 commits into
mainfrom
fork-sync/2026-10-26-1709

Conversation

@Yarden-zamir

Copy link
Copy Markdown
Owner

Cause

Fork Sync run 40365708100 stopped on a merge conflict in PullRequestsPage.tsx. The batch has 3 upstream commits:

Conflicts and resolution

  • PullRequestsPage.tsx imports: upstream adds registerCommands. The fork does not use shortcutLabelForCommand on this page, so that import stays out.

Fork fixes

  • Mobile ThreadComposer.tsx: upstream's new compact editor leaves useLayoutEffect imported but unused, and fork lint fails on it. The import is removed.

Upstream merge

Merges pingdotgg/t3code main at 210b2e7 "fix(mobile): keep expanding composer text above its toolbar (pingdotgg#25396)".

Adopted upstream pull requests

All 7 entries are unchanged at their listed heads. No new merges.

Upstream changes in fork areas

2 files changed on both sides:

  • Pull requests page: the turn refresh and the close sweep change away from the fork owner filter and filter chips code. Both fork features keep their row filters on the new code.
  • Mobile composer: the compact editor sizing changes. The fork theme radius and raised style sit in ComposerSurface, which upstream did not change.

Checks

  • checks.py: typecheck, migration check, adopted pull request check and format pass. Lint passes after the fix above. Knip passes when run alone.
  • fork_tests.py: 180 fork test files pass locally (119 root and 61 web). The apps/server fork test files are left to Fork CI.

Fork repair skill changes

None.

@coderabbitai

coderabbitai Bot commented Oct 26, 2026

Copy link
Copy Markdown

Review in Change Stack →

Finishing Touches
📝 Generate docstrings
  • Commit to this branch
  • Create a new PR
🧪 Generate unit tests (beta)
  • Commit to this branch
  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Comment @coderabbitai help to get the list of available commands.

@Yarden-zamir
Yarden-zamir merged commit 67c1bec into main Oct 26, 2026
13 of 14 checks passed
@Yarden-zamir
Yarden-zamir deleted the fork-sync/2026-10-26-1709 branch October 26, 2026 17:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants