Skip to content

chore: sync upstream pingdotgg/t3code (conflicts) - #48

Merged
LadyBluenotes merged 222 commits into
mainfrom
sync/upstream
Oct 12, 2026
Merged

LadyBluenotes merged 222 commits into
mainfrom
sync/upstream

Conversation

@LadyBluenotes

Copy link
Copy Markdown
Owner

Nightly sync of pingdotgg/t3code at 5753207d53362608f281738eda3a9faf4e13b6be did not merge automatically.

Conflicting files:

  • 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

Resolve the conflicts on this pull request, or merge sync/upstream into main locally and push. The next nightly run closes this once main contains upstream.

juliusmarminge and others added 30 commits October 10, 2026 00:18
…editor is a Windows command shim (pingdotgg#17749)

Co-authored-by: Claude Opus 5.5 <[email protected]>
juliusmarminge and others added 17 commits October 11, 2026 22:09
…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]>
@LadyBluenotes

Copy link
Copy Markdown
Owner Author

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:

  • Keep every line listed in docs/fork.md under "Upstream seams"; those lines are this fork's.
  • Everywhere else take upstream's side.
  • Regenerate apps/web/src/routeTree.gen.ts by running the web build instead of editing it.
  • Typecheck apps/server, packages/contracts and apps/web before you finish.

Conflicting files:

  • 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

# 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]>

Copilot AI commented Oct 12, 2026

Copy link
Copy Markdown

@copilot resolve the merge conflicts on this pull request by merging main into sync/upstream and pushing the result to this branch.

Rules:...

Merged main into sync/upstream, kept the documented seams, regenerated routeTree.gen.ts with the web build, and passed all three requested typechecks. Commit: e38a9e2a4.

@LadyBluenotes
LadyBluenotes merged commit e4a3fa6 into main Oct 12, 2026
7 of 8 checks passed
@LadyBluenotes
LadyBluenotes deleted the sync/upstream branch October 12, 2026 16:53
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]>
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.
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.