Skip to content

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

Merged
Yarden-zamir merged 12 commits into
mainfrom
fork-sync/2026-10-22-0910
Oct 22, 2026
Merged

Yarden-zamir merged 12 commits into
mainfrom
fork-sync/2026-10-22-0910

Conversation

@Yarden-zamir

Copy link
Copy Markdown
Owner

Fork Sync runs https://github.com/Yarden-zamir/t3code/actions/runs/39752592294 and https://github.com/Yarden-zamir/t3code/actions/runs/39767888774 failed on merge conflicts. This pull request merges pingdotgg/t3code main up to 8d3b061, in two merges: 5072fbb (6 commits) and 9f77d4c (2 more commits that landed during the repair).

Conflicts and resolutions

First merge:

Second merge:

  • packages/shared/src/serverSettings.test.ts: both sides added a test. I kept both.
  • apps/mobile/src/App.tsx: the fork getInitialURL (launcher shortcuts) and the upstream getStateFromPath (draft links, fix(mobile): unify draft and thread navigation and composer behavior pingdotgg/t3code#23467) are separate linking options. I kept both.
  • apps/mobile/src/Stack.tsx: I took upstream's NewTaskFlowProvider wrapper and kept the fork ThreadOutboxWorker and ReadAloudWorker in place of ThreadOutboxDrainWorker.
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx: I took upstream's refactor and kept the fork rememberNewThreadProject call before the new navigation. The fork font change in this file lost its use: the draft now renders through the shared composer editor, which already reads the fork font setting through useFontFamily.

Upstream changes in fork areas

Checks

  • vp run typecheck: 35 of 35 packages pass. The mobile package passes again with bfc4061.
  • apps/machine-map typecheck with tsc passes.
  • Fork tests: running on this machine. Fork CI runs the full suites.

t3dotgg and others added 12 commits October 22, 2026 00:37
…tch (pingdotgg#23023)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
… Activities (pingdotgg#23327)

Fixes pingdotgg#15682. Takes over pingdotgg#23035.

Co-authored-by: Taylor Dolezal <onlydole@users.noreply.github.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…gg#23117)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
pingdotgg#23389)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…desktop updates (pingdotgg#23113)

Co-authored-by: PR Batch Tester <agent@local.test>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts:
#	apps/web/src/components/ChatView.tsx
#	pnpm-lock.yaml
Upstream pingdotgg/t3code pingdotgg#23023 removes the tsc-rs package: typescript is now the @tsc-rs/typescript drop-in, and every package typecheck runs tsc. The machine map app still called tsc-rs.
# Conflicts:
#	apps/mobile/src/App.tsx
#	apps/mobile/src/Stack.tsx
#	apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
#	packages/shared/src/serverSettings.test.ts
Upstream pingdotgg/t3code pingdotgg#23467 removes the NewTaskDraft route: a draft is now a Thread route with draft params, and the picker is the NewTaskProject route. With mobileNewThreadProject on, the picker skipped itself only when the route before it was NewTaskDraft, so going back from a draft would start a new draft again. The check now uses isDraftThreadRoute on the route before the picker, like upstream's selectProject.
@Yarden-zamir
Yarden-zamir merged commit e715e73 into main Oct 22, 2026
19 checks passed
@Yarden-zamir
Yarden-zamir deleted the fork-sync/2026-10-22-0910 branch October 22, 2026 11:33
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.

4 participants