Repository navigation
chore(sync): merge pingdotgg/t3code main - #300
Merged
Merged
Conversation
…ngdotgg#23047) Co-authored-by: Julius Marminge <julius0216@outlook.com> Co-authored-by: Claude Haiku 5.5 <noreply@anthropic.com>
…dotgg#23813) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…otgg#23840) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…h git.cafe (pingdotgg#23887) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
…ingdotgg#23471) Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
# Conflicts: # apps/server/src/orchestration-v2/PullRequestWatchReactor.ts # apps/server/src/orchestration-v2/pullRequestWatch.test.ts # apps/server/src/orchestration-v2/pullRequestWatch.ts # apps/server/src/ws.ts # pnpm-lock.yaml
The fork pull request watch reads its remark filter from server settings. Upstream pingdotgg#23863 adds two watch tests without that service.
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 failed on merge conflicts: https://github.com/Yarden-zamir/t3code/actions/runs/39869393173. Issue: #286.
Conflicts
apps/server/src/orchestration-v2/pullRequestWatch.ts: upstream fix(server): wake PR watches when no checks report pingdotgg/t3code#23863 adds a requirednowparameter toevaluatePullRequestWatch. The fork adds an optionalremarkFilterparameter (fork pull request watch remark filter). Kept both, withnowfirst, because a required parameter must come before an optional one.apps/server/src/orchestration-v2/PullRequestWatchReactor.ts: the reactor passes bothnowand the forkremarkFilter.apps/server/src/orchestration-v2/pullRequestWatch.test.ts: kept both import lists. Upstream's test wrapper type expectsnowas the last parameter, so with the fork parameter after it the type becamenever. Replaced the wrapper with explicit parameters, here and inpullRequestWatch.forgejoComments.test.ts.apps/server/src/ws.ts: upstream fix(server): preserve typed requirements as the RPC group grows pingdotgg/t3code#23813 registers the RPC handlers as two smaller groups to stay under a TypeScript limit. The fork registers its own RPCs in a separate layer and removes them from the core group (ServerWsRpcGroupCore). The two upstream groups are now built from the fork core group, so each handler is registered once.pnpm-lock.yaml: upstream raises the Clerk Expo SDKs (chore(mobile): bump Clerk Expo SDKs to the new native client sync pingdotgg/t3code#23047). Took the fork lockfile and re-resolved it. It matches the upstream lockfile change, except for thesupports-colorpeer version that the fork lockfile already resolves (10.2.2).Upstream changes in fork areas
runtimeLayer.test.ts: two new upstream pull request watch tests did not provide server settings, which the fork watch needs for its remark filter. Commit 6bb3b99 addsServerSettings.layerTest()to them, as in the fork's other watch tests.Orchestrator.ts: upstream keepschecksAwaitedSinceon an ended watch. The fork fork-thread source point code is unaffected.CodexAdapterV2.ts: upstream wakes a Codex parent when a native child finishes. The fork thread credential in shell environment is unaffected.apps/mobile/package.json,pnpm-workspace.yaml: Clerk version bump next to the fork font and speech dependencies. No conflict in behaviour.Checks
vp run typecheck: 35 of 35 packages pass.pullRequestWatch.test.ts,pullRequestWatch.forgejoComments.test.ts, watch tests inruntimeLayer.test.ts): pass.