chore: sync upstream pingdotgg/t3code#189
Merged
Merged
Conversation
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Co-authored-by: codex <codex@users.noreply.github.com>
Author
|
@codex review |
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 6395bad630
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
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.
Nightly upstream sync: cherry-picks the 9 new commits from
pingdotgg/t3codesince the last sync (ecb35f7→fdca154).Synced commits
Conflict resolution
Five files needed manual resolution; everything else applied cleanly. This set is the only surface where the merge could introduce a defect.
apps/desktop/src/ipc/DesktopIpcHandlers.ts— import-list conflict. Union: kept fork-localisNotificationSupportedalongside upstream's newgetWindowFullscreenState. Both handler registrations auto-merged and were verified present.apps/desktop/src/window/DesktopWindow.test.ts— window mock conflict. Union: kept the fork'sloadURL(recordscurrentUrlfor thegetURLmock) and adopted upstream'son(recordswindowListeners, required by the new fullscreen tests).apps/server/src/orchestration/decider.ts— both sides added a different guard toproject.meta.update. Kept both, nested underif (command.workspaceRoot !== undefined): the fork's removable-worktree guard runs first, then upstream'srequireActiveProjectWorkspaceRootAbsent. Upstream's guard onproject.createauto-merged.apps/server/src/orchestration/decider.projectScripts.test.ts— git interleaved the fork's and upstream's tests (similar boilerplate). Rebuilt the region from the clean merge stages, keeping the fork's superset: fork's removable-worktree test + upstream's two duplicate-root tests. 9/9 pass.apps/mobile/app.config.ts— both sides added declarations at the same point. Union: upstream's derivediosBundleIdentifier(personal-team aware) plus the fork'seasProjectId/mobileAppVersion/widgets/readReleaseVersion. Upstream'svariant.iosBundleIdentifier→iosBundleIdentifierrewrites auto-merged at every use site and now resolve against that declaration.Modify/delete: upstream modified
apps/web/src/components/preview/PreviewAutomationHosts.tsx, which this fork deleted in #175 (refactor(mcp): remove preview tool surface, ADA-115). Kept the deletion — upstream's change was pure call-site adaptation to the newbrowserTargetResolverAPI, contained no logic the fork needs, and nothing in the tree references the file.pnpm installwas required: pingdotgg#4021 adds theexpo-sharingdependency.Verification
vp run typecheck— passvp check— pass (2301 formatted, 0 lint errors)vp test run— 665 files / 5914 tests pass, 0 failuresPer the fork's upstream-sync policy, this PR is gated by CI; Codex findings in files outside the conflicted set above are upstream-origin and are not blocking.