Repository navigation
chore(sync): merge pingdotgg/t3code main - #285
Merged
Merged
Conversation
…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>
…ingdotgg#23124) 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.
pingdotgg#23454) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# 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.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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:
apps/web/src/components/ChatView.tsx(imports only): upstream wrapsMessagesTimelinein the newThreadTimeline(pingdotgg/t3code perf(web): streamed reply text no longer re-renders ChatView pingdotgg/t3code#23117). I took the upstream imports and kept the forkuseForkMessageLinkRequest.ThreadTimelinepasses its other props through toMessagesTimeline, so the forkforkMessageLinkprop still reaches it.pnpm-lock.yaml: I re-resolved the fork lockfile withpnpm install --lockfile-only. The package versions match upstream's (chore(typecheck): typescript is the tsc-rs drop-in, no effect-tsgo patch pingdotgg/t3code#23023:typescriptis now@tsc-rs/typescript0.8.0,@effect/tsgoandtsc-rsare gone). Only peer-set hashes differ, because the fork has more packages.Second merge:
packages/shared/src/serverSettings.test.ts: both sides added a test. I kept both.apps/mobile/src/App.tsx: the forkgetInitialURL(launcher shortcuts) and the upstreamgetStateFromPath(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'sNewTaskFlowProviderwrapper and kept the forkThreadOutboxWorkerandReadAloudWorkerin place ofThreadOutboxDrainWorker.apps/mobile/src/features/threads/NewTaskDraftScreen.tsx: I took upstream's refactor and kept the forkrememberNewThreadProjectcall 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 throughuseFontFamily.Upstream changes in fork areas
tsc-rspackage. Commit 4ea5356 changes the forkapps/machine-maptypecheck fromtsc-rstotsc, like upstream's packages.NewTaskDraftroute: a draft is now aThreadroute withdraftparams, and the picker isNewTaskProject. With the forkmobileNewThreadProjectsetting on, the picker skipped itself unless the route before it wasNewTaskDraft, so going back from a draft would start a draft again. Commit bfc4061 checksisDraftThreadRouteon the route before the picker, like upstream'sselectProject. The fork/newlauncher shortcut still resolves, because the picker keeps thenewlink path.ClaudeAdapterV2.ts: Claude now starts through a process group watcher (fix(server): a Claude agent stops when the server that started it dies pingdotgg/t3code#23389). The fork background task details are unchanged.selfUpdate.ts: runtimes also prune for an unmanaged server that runs its pinned runtime (fix(server): SSH hosts no longer keep every old 300 MB runtime after desktop updates pingdotgg/t3code#23113). The fork update target stays.threadWorkflows.ts: the queue state readsThreadStructure, which has theturnItemsthat the fork usage limit hold reads.serverSettings.ts,settings.ts: the idle compaction translation for older clients (fix(settings): older clients connect again after idle compaction modes pingdotgg/t3code#23454). The fork setting patches are unchanged.HomeScreen.tsx,ComposerAttachmentButton.tsx,ThreadComposer.tsx,ThreadDetailScreen.tsx,ThreadNavigationSidebar.tsx,ThreadRouteScreen.tsx,thread-list-v2-items.tsx,use-thread-composer-state.ts) keep the fork card layout, group tabs, camera, theme style, message links and queue hold lines.Checks
vp run typecheck: 35 of 35 packages pass. The mobile package passes again with bfc4061.apps/machine-maptypecheck withtscpasses.