Repository navigation
chore: sync upstream pingdotgg/t3code (conflicts) - #48
Merged
Merged
Conversation
pingdotgg#17681) Co-authored-by: Claude Opus 5.5 <[email protected]>
… the PR (pingdotgg#17729) Co-authored-by: Claude Opus 5.5 <[email protected]>
…editor is a Windows command shim (pingdotgg#17749) Co-authored-by: Claude Opus 5.5 <[email protected]>
) Co-authored-by: Claude <[email protected]>
…utput (pingdotgg#17376) Co-authored-by: Claude Opus 5.5 <[email protected]>
… again (pingdotgg#17379) Co-authored-by: Claude Opus 5.5 <[email protected]>
…its thread (pingdotgg#17327) Co-authored-by: Claude Opus 5.5 <[email protected]>
…a check is still going (pingdotgg#17344) Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Yash Singh <[email protected]>
…ingdotgg#17496) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#17223) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Yash Singh <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
…#18454) Co-authored-by: Claude Opus 5.5 <[email protected]>
…uilds (pingdotgg#18560) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#18564) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#18565) Co-authored-by: Claude Opus 5.5 <[email protected]>
…dotgg#18053) Co-authored-by: Claude Opus 5.5 <[email protected]>
…otgg#18450) Co-authored-by: Claude Opus 5.5 <[email protected]>
…crashes (pingdotgg#18566) Disable WaylandWpColorManagerV1 before Electron is ready only on native Wayland Hyprland sessions running a stock 0.48.0-0.50.1 release, which advertise FEATURE_SET_PRIMARIES but reject set_primaries (hyprwm/Hyprland#9444; fixed in 0.51.0 by hyprwm/Hyprland#11499). Any probe failure or explicit feature override keeps the default. Co-authored-by: Claude Opus 5.5 <[email protected]>
Owner
Author
|
@copilot resolve the merge conflicts on this pull request by merging Rules:
Conflicting files:
|
# Conflicts: # apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.tsx # apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.tsx # apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts # apps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.kt # apps/mobile/package.json # apps/mobile/src/Stack.tsx # apps/mobile/src/components/AppSymbol.ios.tsx # apps/mobile/src/components/AppSymbol.tsx # apps/mobile/src/components/ComposerContextSheet.tsx # apps/mobile/src/features/files/FileMarkdownPreview.tsx # apps/mobile/src/features/home/HomeRouteScreen.tsx # apps/mobile/src/features/home/HomeScreen.tsx # apps/mobile/src/features/home/ThreadListFilters.tsx # apps/mobile/src/features/home/home-list-options.test.ts # apps/mobile/src/features/home/home-list-options.ts # apps/mobile/src/features/pull-requests/PullRequestControls.tsx # apps/mobile/src/features/pull-requests/PullRequestDescription.tsx # apps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestFiles.tsx # apps/mobile/src/features/pull-requests/PullRequestListFilters.tsx # apps/mobile/src/features/pull-requests/PullRequestListRow.tsx # apps/mobile/src/features/pull-requests/PullRequestMarkdown.tsx # apps/mobile/src/features/pull-requests/PullRequestMergeControls.tsx # apps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsx # apps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsx # apps/mobile/src/features/pull-requests/PullRequestSheetContent.tsx # apps/mobile/src/features/pull-requests/PullRequestStackCard.tsx # apps/mobile/src/features/pull-requests/PullRequestTimeline.tsx # apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx # apps/mobile/src/features/pull-requests/pullRequestDescription.test.ts # apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.ts # apps/mobile/src/features/pull-requests/pullRequestDescriptionContent.ts # apps/mobile/src/features/pull-requests/pullRequestList.ts # apps/mobile/src/features/pull-requests/usePullRequestList.ts # apps/mobile/src/features/pull-requests/usePullRequestListActions.ts # apps/mobile/src/features/pull-requests/usePullRequestThreads.ts # apps/mobile/src/features/settings/SettingsMicrophoneRouteScreen.tsx # apps/mobile/src/features/threads/ThreadFeed.tsx # apps/mobile/src/features/threads/ThreadMarkdownImage.tsx # apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx # apps/mobile/src/features/threads/ThreadRouteScreen.tsx # apps/mobile/src/features/usage/usageProviders.ts # apps/mobile/src/features/workspace/ListFilterMenu.tsx # apps/mobile/src/features/workspace/WorkspaceDock.tsx # apps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsx # apps/mobile/src/features/workspace/WorkspaceTabsContext.tsx # apps/mobile/src/lib/markdownHtml.test.ts # apps/mobile/src/lib/markdownImageSources.ts # apps/mobile/src/native/NativeHeaderToolbar.tsx # apps/mobile/src/native/V5StackHeader.ios.tsx # apps/mobile/src/native/useOpenPullRequest.ts # apps/mobile/src/persistence/mobile-preferences.ts # apps/server/package.json # apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts # apps/server/src/provider/builtInDrivers.ts # apps/server/src/serverSettings.ts # apps/server/src/sourceControl/sourceControlHostSecrets.ts # apps/web/src/components/ChatView.tsx # apps/web/src/components/chat/MessagesTimeline.test.tsx # apps/web/src/components/settings/ProviderSettingsForm.tsx # apps/web/src/components/settings/SourceControlWritingSettings.tsx # apps/web/src/components/usage/UsageProviderChart.test.ts # apps/web/src/components/usage/usageProviders.ts # apps/web/src/lib/windowControlsOverlay.ts # apps/web/src/routeTree.gen.ts # docs/operations/mobile-screens-fork.md # docs/user/usage.md # package.json # packages/contracts/src/usage.ts # packages/provider-pi/src/server/usage.ts # packages/source-control-bitbucket/src/client/definition.ts # packages/source-control-core/src/client/definition.ts # packages/source-control-gitcafe/package.json # packages/source-control-gitcafe/src/client/definition.ts # packages/source-control-github/src/client/definition.ts # pnpm-lock.yaml Co-authored-by: LadyBluenotes <[email protected]>
Merged |
This was referenced Oct 12, 2026
LadyBluenotes
added a commit
that referenced
this pull request
Oct 12, 2026
) The conflict resolution in the upstream sync (#48) took upstream's side of every file the fork had extended for the Copilot provider. The package stayed, but nothing registered it: the server and mobile workspaces lost the dependency, the adapter, driver and usage reader lists lost its entries, the usage contract and the web and mobile usage charts lost the "copilot" provider, and the text-generation fallback order lost it as well. Typecheck has been red on main since, because the package's usage reader still named a provider the contract no longer knew and a `mightCarryUsage` hook upstream had replaced in the same sync. This puts each of those lines back where upstream now keeps them and moves the usage reader to upstream's `usageMarkers`, the byte-level prefilter that replaced the hook. Co-authored-by: Claude <[email protected]>
This was referenced Oct 12, 2026
LadyBluenotes
added a commit
that referenced
this pull request
Oct 12, 2026
A real merge of upstream main, so the next nightly sync starts from this point instead of re-resolving the conflicts the squashed #48 left behind.
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 sync of
pingdotgg/t3codeat5753207d53362608f281738eda3a9faf4e13b6bedid not merge automatically.Conflicting files:
apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.tsxapps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.tsxapps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.tsapps/mobile/modules/t3-review-diff/android/src/main/java/expo/modules/t3reviewdiff/T3ReviewDiffModule.ktapps/mobile/package.jsonapps/mobile/src/Stack.tsxapps/mobile/src/components/AppSymbol.ios.tsxapps/mobile/src/components/AppSymbol.tsxapps/mobile/src/components/ComposerContextSheet.tsxapps/mobile/src/features/files/FileMarkdownPreview.tsxapps/mobile/src/features/home/HomeRouteScreen.tsxapps/mobile/src/features/home/HomeScreen.tsxapps/mobile/src/features/home/ThreadListFilters.tsxapps/mobile/src/features/home/home-list-options.test.tsapps/mobile/src/features/home/home-list-options.tsapps/mobile/src/features/pull-requests/PullRequestControls.tsxapps/mobile/src/features/pull-requests/PullRequestDescription.tsxapps/mobile/src/features/pull-requests/PullRequestDiscussionScreen.tsxapps/mobile/src/features/pull-requests/PullRequestFiles.tsxapps/mobile/src/features/pull-requests/PullRequestListFilters.tsxapps/mobile/src/features/pull-requests/PullRequestListRow.tsxapps/mobile/src/features/pull-requests/PullRequestMarkdown.tsxapps/mobile/src/features/pull-requests/PullRequestMergeControls.tsxapps/mobile/src/features/pull-requests/PullRequestReviewSheet.tsxapps/mobile/src/features/pull-requests/PullRequestRouteScreen.tsxapps/mobile/src/features/pull-requests/PullRequestSheetContent.tsxapps/mobile/src/features/pull-requests/PullRequestStackCard.tsxapps/mobile/src/features/pull-requests/PullRequestTimeline.tsxapps/mobile/src/features/pull-requests/PullRequestsScreen.tsxapps/mobile/src/features/pull-requests/pullRequestDescription.test.tsapps/mobile/src/features/pull-requests/pullRequestDescriptionContent.test.tsapps/mobile/src/features/pull-requests/pullRequestDescriptionContent.tsapps/mobile/src/features/pull-requests/pullRequestList.tsapps/mobile/src/features/pull-requests/usePullRequestList.tsapps/mobile/src/features/pull-requests/usePullRequestListActions.tsapps/mobile/src/features/pull-requests/usePullRequestThreads.tsapps/mobile/src/features/settings/SettingsMicrophoneRouteScreen.tsxapps/mobile/src/features/threads/ThreadFeed.tsxapps/mobile/src/features/threads/ThreadMarkdownImage.tsxapps/mobile/src/features/threads/ThreadNavigationSidebar.tsxapps/mobile/src/features/threads/ThreadRouteScreen.tsxapps/mobile/src/features/usage/usageProviders.tsapps/mobile/src/features/workspace/ListFilterMenu.tsxapps/mobile/src/features/workspace/WorkspaceDock.tsxapps/mobile/src/features/workspace/WorkspaceNativeTabs.ios.tsxapps/mobile/src/features/workspace/WorkspaceTabsContext.tsxapps/mobile/src/lib/markdownHtml.test.tsapps/mobile/src/lib/markdownImageSources.tsapps/mobile/src/native/NativeHeaderToolbar.tsxapps/mobile/src/native/V5StackHeader.ios.tsxapps/mobile/src/native/useOpenPullRequest.tsapps/mobile/src/persistence/mobile-preferences.tsapps/server/package.jsonapps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.tsapps/server/src/provider/builtInDrivers.tsapps/server/src/serverSettings.tsapps/server/src/sourceControl/sourceControlHostSecrets.tsapps/web/src/components/ChatView.tsxapps/web/src/components/chat/MessagesTimeline.test.tsxapps/web/src/components/settings/ProviderSettingsForm.tsxapps/web/src/components/settings/SourceControlWritingSettings.tsxapps/web/src/components/usage/UsageProviderChart.test.tsapps/web/src/components/usage/usageProviders.tsapps/web/src/lib/windowControlsOverlay.tsapps/web/src/routeTree.gen.tsdocs/operations/mobile-screens-fork.mddocs/user/usage.mdpackage.jsonpackages/contracts/src/usage.tspackages/provider-pi/src/server/usage.tspackages/source-control-bitbucket/src/client/definition.tspackages/source-control-core/src/client/definition.tspackages/source-control-gitcafe/package.jsonpackages/source-control-gitcafe/src/client/definition.tspackages/source-control-github/src/client/definition.tspnpm-lock.yamlResolve the conflicts on this pull request, or merge
sync/upstreamintomainlocally and push. The next nightly run closes this oncemaincontains upstream.