Skip to content

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

Merged
LadyBluenotes merged 763 commits into
mainfrom
sync/upstream
Oct 24, 2026
Merged

LadyBluenotes merged 763 commits into
mainfrom
sync/upstream

Conversation

@LadyBluenotes

@LadyBluenotes LadyBluenotes commented Oct 19, 2026 •

Copy link
Copy Markdown
Owner

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

Conflicting files:

  • apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift
  • apps/mobile/package.json
  • apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
  • apps/mobile/src/features/home/HomeHeader.tsx
  • apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
  • apps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsx
  • apps/mobile/src/features/pull-requests/PullRequestsScreen.tsx
  • apps/mobile/src/features/pull-requests/pullRequestList.test.ts
  • apps/mobile/src/features/threads/ThreadDetailScreen.tsx
  • apps/mobile/src/features/threads/ThreadFeed.tsx
  • apps/mobile/src/features/threads/useThreadHeaderOptions.tsx
  • apps/mobile/src/features/workspace/WorkspaceRootScreen.tsx
  • apps/mobile/src/features/workspace/WorkspaceToolbar.ios.tsx
  • apps/mobile/src/lib/layout.test.ts
  • apps/mobile/src/native/V5StackHeader.ios.tsx
  • apps/mobile/src/native/native-layout-metrics.tsx
  • apps/mobile/src/state/use-thread-composer-state.ts
  • apps/server/src/auth/EnvironmentAuth.test.ts
  • apps/server/src/auth/PairingGrantStore.test.ts
  • apps/server/src/git/GitManager.test.ts
  • apps/server/src/mcp/McpHttpServer.ts
  • apps/server/src/mcp/OrchestratorMcpService.ts
  • apps/server/src/mcp/WorktreeMcpService.test.ts
  • apps/server/src/mcp/WorktreeMcpService.ts
  • apps/server/src/mcp/toolkits/orchestrator/tools.ts
  • apps/server/src/mcp/toolkits/worktree/registration.test.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/CheckpointRestoreSafety.test.ts
  • apps/server/src/orchestration-v2/CheckpointRollbackService.test.ts
  • apps/server/src/orchestration-v2/CheckpointRollbackService.ts
  • apps/server/src/orchestration-v2/CommandPolicy.test.ts
  • apps/server/src/orchestration-v2/Orchestrator.ts
  • apps/server/src/orchestration-v2/ProjectionStore.test.ts
  • apps/server/src/orchestration-v2/ProjectionStore.ts
  • apps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.ts
  • apps/server/src/orchestration-v2/ProviderTurnStartService.test.ts
  • apps/server/src/orchestration-v2/builtInProviderAdapterDrivers.ts
  • apps/server/src/orchestration-v2/testkit/ProviderTurnStartMemory.fixture.mjs
  • apps/server/src/preview/ServerBrowserPage.test.ts
  • apps/server/src/preview/ServerBrowserPage.ts
  • apps/server/src/project/RepositoryIdentityResolver.ts
  • apps/server/src/provider/CodexProvider.ts
  • apps/server/src/provider/ProviderRegistry.test.ts
  • apps/server/src/provider/model-manifest.json
  • apps/server/src/provider/providerCompatibility.test.ts
  • apps/server/src/pullRequest/PullRequestService.ts
  • apps/server/src/review/ReviewService.test.ts
  • apps/server/src/scheduledTasks/ScheduledTaskService.ts
  • apps/server/src/scheduledTasks/ScheduledTaskService.webhook.test.ts
  • apps/server/src/scheduledTasks/webhookTemplate.test.ts
  • apps/server/src/scheduledTasks/webhookTemplate.ts
  • apps/server/src/server.ts
  • apps/server/src/serverLogger.test.ts
  • apps/server/src/serverRuntimeStartup.ts
  • apps/server/src/serverSettings.test.ts
  • apps/server/src/storageCleanup.ts
  • apps/server/src/terminal/Manager.test.ts
  • apps/server/src/terminal/nodePtyConsoleList.test.ts
  • apps/server/src/vcs/GitVcsDriverCore.test.ts
  • apps/server/src/vcs/GitVcsDriverCore.ts
  • apps/server/src/workspace/KnownWorkspaces.ts
  • apps/server/src/workspace/WorkspaceFileSystem.ts
  • apps/server/vite.config.ts
  • apps/web/package.json
  • apps/web/src/browser/ElectronBrowserHost.tsx
  • apps/web/src/browser/HostedBrowserWebview.tsx
  • apps/web/src/components/BranchToolbar.tsx
  • apps/web/src/components/BranchToolbarBranchSelector.tsx
  • apps/web/src/components/BranchToolbarEnvModeSelector.tsx
  • apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
  • apps/web/src/components/ChatMarkdown.test.tsx
  • apps/web/src/components/ChatMarkdown.tsx
  • apps/web/src/components/ChatView.logic.test.ts
  • apps/web/src/components/ChatView.logic.ts
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/CommandPaletteResults.tsx
  • apps/web/src/components/ComposerPromptEditorTiptap.navigation.browser.test.tsx
  • apps/web/src/components/ComposerPromptEditorTiptap.tsx
  • apps/web/src/components/DiffPanel.tsx
  • apps/web/src/components/DiffWorkerPoolProvider.tsx
  • apps/web/src/components/GitActionsControl.test.ts
  • apps/web/src/components/GitActionsControl.tsx
  • apps/web/src/components/LegacySidebar.tsx
  • apps/web/src/components/PersistentThreadTerminals.tsx
  • apps/web/src/components/ProviderUpdateEnvironmentRows.tsx
  • apps/web/src/components/ProviderUpdateLaunchNotification.environments.ts
  • apps/web/src/components/ProviderUpdateLaunchNotification.tsx
  • apps/web/src/components/ProviderUpdatePrimaryNotification.tsx
  • apps/web/src/components/ProviderUpdatesAction.tsx
  • apps/web/src/components/PullRequestThreadDialog.tsx
  • apps/web/src/components/RightPanelTabs.keyboard.browser.test.tsx
  • apps/web/src/components/RightPanelTabs.tsx
  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/ThreadTerminalDrawer.tsx
  • apps/web/src/components/chat/ChangedFilesTree.tsx
  • apps/web/src/components/chat/ChatCanvas.browser.test.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/HtmlRenderFrame.tsx
  • apps/web/src/components/chat/MessagesTimeline.logic.ts
  • apps/web/src/components/chat/MessagesTimeline.test.tsx
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • apps/web/src/components/chat/ModelPickerContent.tsx
  • apps/web/src/components/chat/OpenInPicker.tsx
  • apps/web/src/components/chat/QueuedRunsControl.tsx
  • apps/web/src/components/chat/RightPanelSurfaceContent.tsx
  • apps/web/src/components/chat/ThreadDetailsControl.browser.test.tsx
  • apps/web/src/components/chat/ThreadRelationshipsControl.tsx
  • apps/web/src/components/chat/TraitsPicker.tsx
  • apps/web/src/components/chat/WorkLog.browser.test.tsx
  • apps/web/src/components/chat/ZoomableImage.tsx
  • apps/web/src/components/chat/composerFocusRedirect.ts
  • apps/web/src/components/chat/composerProviderState.test.tsx
  • apps/web/src/components/chat/composerProviderState.tsx
  • apps/web/src/components/chat/threadFindHighlights.browser.test.tsx
  • apps/web/src/components/chat/threadFindPosition.browser.test.ts
  • apps/web/src/components/chat/timelineMinimapWheel.browser.test.ts
  • apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
  • apps/web/src/components/chat/useChatShortcuts.ts
  • apps/web/src/components/chat/usePendingThreadRequests.ts
  • apps/web/src/components/chat/useQueuedRunEdit.ts
  • apps/web/src/components/chat/useThreadFind.ts
  • apps/web/src/components/chat/useThreadFindNavigation.browser.test.tsx
  • apps/web/src/components/chat/useWorktreeSetup.ts
  • apps/web/src/components/cloud/ConnectOnboardingDialog.tsx
  • apps/web/src/components/desktop/SnapShotCoordinator.tsx
  • apps/web/src/components/device/DevicePanel.tsx
  • apps/web/src/components/diffs/AnnotatableCodeView.tsx
  • apps/web/src/components/diffs/DiffFileTree.tsx
  • apps/web/src/components/diffs/StyledDiffCodeView.test.tsx
  • apps/web/src/components/diffs/useReviewFilePatches.ts
  • apps/web/src/components/files/FileBreadcrumbs.tsx
  • apps/web/src/components/files/FileBrowserPanel.tsx
  • apps/web/src/components/files/fileTreeDragMention.test.ts
  • apps/web/src/components/files/projectFilesQueryState.ts
  • apps/web/src/components/media/MediaVideoPlayer.tsx
  • apps/web/src/components/onboarding/FirstRunGate.tsx
  • apps/web/src/components/onboarding/WelcomeWizard.browser.test.tsx
  • apps/web/src/components/preview/PreviewView.tsx
  • apps/web/src/components/projectScriptEditor.tsx
  • apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
  • apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
  • apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
  • apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
  • apps/web/src/components/pullRequest/guide/GuideExcerpt.tsx
  • apps/web/src/components/pullRequest/pullRequestFilesViewed.logic.test.ts
  • apps/web/src/components/pullRequest/pullRequestList.logic.test.ts
  • apps/web/src/components/pullRequest/usePullRequestFilesViewed.test.tsx
  • apps/web/src/components/search/ProjectContentSearchDialog.test.tsx
  • apps/web/src/components/settings/AddProviderInstanceDialog.tsx
  • apps/web/src/components/settings/ConnectionsSettings.tsx
  • apps/web/src/components/settings/DeviceHostsSettings.tsx
  • apps/web/src/components/settings/KeybindingsSettings.tsx
  • apps/web/src/components/settings/ProjectFaviconPickerDialog.tsx
  • apps/web/src/components/settings/ProjectSettingsPanel.tsx
  • apps/web/src/components/settings/ProviderSettingsForm.test.ts
  • apps/web/src/components/settings/ProviderSettingsForm.tsx
  • apps/web/src/components/settings/ProviderSettingsPanel.tsx
  • apps/web/src/components/settings/ScheduledTasksSettings.tsx
  • apps/web/src/components/settings/SettingsPanels.tsx
  • apps/web/src/components/settings/SettingsScopeContext.tsx
  • apps/web/src/components/settings/SnapShotSettings.test.tsx
  • apps/web/src/components/settings/SnapShotSettings.tsx
  • apps/web/src/components/settings/StorageSettings.tsx
  • apps/web/src/components/settings/ThemeImportDialog.tsx
  • apps/web/src/components/settings/useProjectScriptSettings.ts
  • apps/web/src/components/settings/useScopedModelAvailability.ts
  • apps/web/src/components/settings/useScopedSettings.ts
  • apps/web/src/components/settings/useSettingsProjectGroups.ts
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx
  • apps/web/src/components/sidebar/SidebarUpdateCapsule.tsx
  • apps/web/src/components/sidebar/useUpdateEverything.ts
  • apps/web/src/components/terminal/useThreadTerminalActions.ts
  • apps/web/src/components/ui/sidebar.tsx
  • apps/web/src/components/ui/switch.browser.test.tsx
  • apps/web/src/components/usage/UsagePage.tsx
  • apps/web/src/components/usage/UsageProviderChart.tsx
  • apps/web/src/composer-list-split.browser.test.ts
  • apps/web/src/composerDraftStore.ts
  • apps/web/src/connection/platform.test.ts
  • apps/web/src/connection/platform.ts
  • apps/web/src/hooks/useHandleNewThread.test.ts
  • apps/web/src/hooks/useHandleNewThread.ts
  • apps/web/src/hooks/useLocalStorage.hook.browser.test.tsx
  • apps/web/src/hooks/useProactivePanels.ts
  • apps/web/src/hooks/usePullRequestLinking.ts
  • apps/web/src/hooks/useSettings.ts
  • apps/web/src/hooks/useTheme.ts
  • apps/web/src/hooks/useThreadActions.ts
  • apps/web/src/lib/composerPathSearchState.ts
  • apps/web/src/lib/editableFocus.browser.test.ts
  • apps/web/src/lib/openPullRequestLink.ts
  • apps/web/src/onboarding/firstRun.ts
  • apps/web/src/onboarding/providerReadiness.logic.test.ts
  • apps/web/src/onboarding/useProjectScans.ts
  • apps/web/src/providerUpdateDismissal.ts
  • apps/web/src/reactCompilerCoverage.test.ts
  • apps/web/src/remoteOpen.ts
  • apps/web/src/routes/_chat.index.tsx
  • apps/web/src/routes/_chat.pull-requests.tsx
  • apps/web/src/session-logic.ts
  • apps/web/src/shortcutModifierState.browser.test.ts
  • apps/web/src/state/entities.ts
  • apps/web/src/state/queries.ts
  • apps/web/src/state/session.ts
  • apps/web/src/state/usePullRequestStack.ts
  • docs/internals/web-ui.md
  • oxlint-plugin-t3code/rules/no-manual-memo.test.ts
  • oxlint-plugin-t3code/rules/no-manual-memo.ts
  • packages/client-runtime/package.json
  • packages/client-runtime/src/authorization/layer.test.ts
  • packages/client-runtime/src/connection/outdatedHostUpdate.ts
  • packages/client-runtime/src/connection/registry.test.ts
  • packages/client-runtime/src/connection/routes.test.ts
  • packages/client-runtime/src/pullRequestQuery.test.ts
  • packages/client-runtime/src/state/commandPermissions.test.ts
  • packages/client-runtime/src/state/composerDispatch.test.ts
  • packages/client-runtime/src/state/serverConfigProjection.test.ts
  • packages/client-runtime/src/state/serverConfigProjection.ts
  • packages/client-runtime/src/state/shellReducer.test.ts
  • packages/client-runtime/src/state/threadDetail.ts
  • packages/client-runtime/src/state/threadSubagents.test.ts
  • packages/contracts/src/clientRpcPermissions.ts
  • packages/contracts/src/rpc.test.ts
  • packages/contracts/src/settings.test.ts
  • packages/contracts/src/worktreeMcp.ts
  • packages/provider-core/src/server/orchestrationInstructions.ts
  • packages/shared/src/cliRelease.test.ts
  • packages/shared/src/cliRelease.ts
  • packages/shared/src/orchestrationV2PendingBackgroundWork.test.ts
  • packages/source-control-github/src/server/GitHubSourceControlProvider.test.ts
  • packages/source-control-gitlab/src/server/GitLabCli.test.ts
  • packages/ssh/src/command.test.ts
  • packages/ssh/src/tunnel.test.ts
  • patches/[email protected]
  • pnpm-lock.yaml
  • pnpm-workspace.yaml
  • scripts/build-desktop-artifact.test.ts
  • third-party-licenses.config.json
  • vite.config.ts

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.

Quicksaver and others added 30 commits October 18, 2026 12:19
…#18832)

Co-authored-by: SAPHID <[email protected]>
Co-authored-by: GPT-6.1 Sol <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
… attachment (pingdotgg#21101)

Co-authored-by: PR Batch Tester <[email protected]>
Co-authored-by: Tejas Rahane <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Saikrishna1876 and others added 23 commits October 18, 2026 22:07
…report (pingdotgg#15738)

Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: Julius Marminge <[email protected]>
…ngdotgg#18423)

Co-authored-by: GPT-6.1 Sol <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Julius Marminge <[email protected]>
…tgg#16040)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
Co-authored-by: SAPHID <[email protected]>
Co-authored-by: Julius Marminge <[email protected]>
… without permission (pingdotgg#20237)

Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>
…uanian, Basque or Azerbaijani locale (pingdotgg#19616)

Co-authored-by: PR Batch Tester <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Julius Marminge <[email protected]>
… provider (pingdotgg#18467)

Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Claude Fable 5.1 <[email protected]>
Co-authored-by: Claude Opus 5.5 <[email protected]>
Co-authored-by: Julius Marminge <[email protected]>
Co-authored-by: Julius Marminge <[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/package.json
  • apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
  • apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
  • apps/mobile/src/features/threads/ThreadDetailScreen.tsx
  • apps/mobile/src/features/threads/ThreadFeed.tsx
  • apps/mobile/src/lib/layout.test.ts
  • apps/mobile/src/lib/layout.ts
  • apps/mobile/src/state/use-thread-composer-state.ts
  • apps/server/src/mcp/McpHttpServer.ts
  • apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
  • apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
  • apps/server/src/orchestration-v2/CommandPolicy.test.ts
  • apps/server/src/serverLogger.test.ts
  • apps/server/src/vcs/GitVcsDriverCore.ts
  • apps/server/vite.config.ts
  • apps/web/package.json
  • apps/web/src/browser/ElectronBrowserHost.tsx
  • apps/web/src/components/BranchToolbarBranchSelector.tsx
  • apps/web/src/components/BranchToolbarEnvModeSelector.tsx
  • apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
  • apps/web/src/components/ChatMarkdown.test.tsx
  • apps/web/src/components/ChatMarkdown.tsx
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/DiffPanel.tsx
  • apps/web/src/components/GitActionsControl.test.ts
  • apps/web/src/components/GitActionsControl.tsx
  • apps/web/src/components/LegacySidebar.tsx
  • apps/web/src/components/PersistentThreadTerminals.tsx
  • apps/web/src/components/ProviderUpdateLaunchNotification.environments.ts
  • apps/web/src/components/ProviderUpdatesAction.tsx
  • apps/web/src/components/RightPanelTabs.tsx
  • apps/web/src/components/Sidebar.tsx
  • apps/web/src/components/chat/ChangedFilesTree.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/HtmlRenderFrame.tsx
  • apps/web/src/components/chat/MessagesTimeline.test.tsx
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • apps/web/src/components/chat/ModelPickerContent.tsx
  • apps/web/src/components/chat/OpenInPicker.tsx
  • apps/web/src/components/chat/ThreadRelationshipsControl.tsx
  • apps/web/src/components/chat/ZoomableImage.tsx
  • apps/web/src/components/chat/composerFocusRedirect.ts
  • apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
  • apps/web/src/components/device/DevicePanel.tsx
  • apps/web/src/components/diffs/useReviewFilePatches.ts
  • apps/web/src/components/onboarding/FirstRunGate.tsx
  • apps/web/src/components/preview/PreviewView.tsx
  • apps/web/src/components/projectScriptEditor.tsx
  • apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
  • apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
  • apps/web/src/components/pullRequest/usePullRequestFilesViewed.browser.test.tsx
  • apps/web/src/components/search/ProjectContentSearchDialog.test.tsx
  • apps/web/src/components/settings/AddProviderInstanceDialog.tsx
  • apps/web/src/components/settings/ConnectionsSettings.tsx
  • apps/web/src/components/settings/DeviceHostsSettings.tsx
  • apps/web/src/components/settings/KeybindingsSettings.tsx
  • apps/web/src/components/settings/ProviderSettingsPanel.tsx
  • apps/web/src/components/settings/ScheduledTasksSettings.tsx
  • apps/web/src/components/settings/SettingsScopeContext.tsx
  • apps/web/src/components/settings/SnapShotSettings.test.tsx
  • apps/web/src/components/settings/SnapShotSettings.tsx
  • apps/web/src/components/settings/StorageSettings.tsx
  • apps/web/src/components/settings/useScopedModelAvailability.ts
  • apps/web/src/components/settings/useScopedSettings.ts
  • apps/web/src/components/settings/useSettingsProjectGroups.ts
  • apps/web/src/components/sidebar/SidebarChrome.tsx
  • apps/web/src/components/sidebar/SidebarUpdateCapsule.tsx
  • apps/web/src/components/sidebar/useUpdateEverything.ts
  • apps/web/src/components/terminal/useThreadTerminalActions.ts
  • apps/web/src/components/usage/UsagePage.tsx
  • apps/web/src/hooks/useHandleNewThread.ts
  • apps/web/src/hooks/usePullRequestLinking.ts
  • apps/web/src/hooks/useSettings.ts
  • apps/web/src/onboarding/firstRun.ts
  • apps/web/src/onboarding/useProjectScans.ts
  • apps/web/src/remoteOpen.ts
  • apps/web/src/state/entities.ts
  • apps/web/src/state/queries.ts
  • apps/web/src/state/session.ts
  • apps/web/src/state/usePullRequestStack.ts
  • apps/web/vite.config.ts
  • docs/internals/web-ui.md
  • oxlint-plugin-t3code/rules/no-manual-memo.test.ts
  • oxlint-plugin-t3code/rules/no-manual-memo.ts
  • packages/client-runtime/package.json
  • packages/client-runtime/src/state/serverConfigProjection.test.ts
  • packages/client-runtime/src/state/serverConfigProjection.ts
  • packages/provider-core/src/server/orchestrationInstructions.ts
  • pnpm-lock.yaml
  • scripts/build-desktop-artifact.test.ts

# Conflicts:
#	apps/mobile/package.json
#	apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx
#	apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
#	apps/mobile/src/features/threads/ThreadDetailScreen.tsx
#	apps/mobile/src/features/threads/ThreadFeed.tsx
#	apps/mobile/src/lib/layout.test.ts
#	apps/mobile/src/lib/layout.ts
#	apps/mobile/src/state/use-thread-composer-state.ts
#	apps/server/src/mcp/McpHttpServer.ts
#	apps/server/src/mcp/OrchestratorMcpService.activity.test.ts
#	apps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.ts
#	apps/server/src/orchestration-v2/CommandPolicy.test.ts
#	apps/server/src/serverLogger.test.ts
#	apps/server/src/vcs/GitVcsDriverCore.ts
#	apps/server/vite.config.ts
#	apps/web/package.json
#	apps/web/src/browser/ElectronBrowserHost.tsx
#	apps/web/src/components/BranchToolbarBranchSelector.tsx
#	apps/web/src/components/BranchToolbarEnvModeSelector.tsx
#	apps/web/src/components/BranchToolbarEnvironmentSelector.tsx
#	apps/web/src/components/ChatMarkdown.test.tsx
#	apps/web/src/components/ChatMarkdown.tsx
#	apps/web/src/components/ChatView.tsx
#	apps/web/src/components/CommandPalette.tsx
#	apps/web/src/components/DiffPanel.tsx
#	apps/web/src/components/GitActionsControl.test.ts
#	apps/web/src/components/GitActionsControl.tsx
#	apps/web/src/components/LegacySidebar.tsx
#	apps/web/src/components/PersistentThreadTerminals.tsx
#	apps/web/src/components/ProviderUpdateLaunchNotification.environments.ts
#	apps/web/src/components/ProviderUpdatesAction.tsx
#	apps/web/src/components/RightPanelTabs.tsx
#	apps/web/src/components/Sidebar.tsx
#	apps/web/src/components/chat/ChangedFilesTree.tsx
#	apps/web/src/components/chat/ChatComposer.tsx
#	apps/web/src/components/chat/HtmlRenderFrame.tsx
#	apps/web/src/components/chat/MessagesTimeline.test.tsx
#	apps/web/src/components/chat/MessagesTimeline.tsx
#	apps/web/src/components/chat/ModelPickerContent.tsx
#	apps/web/src/components/chat/OpenInPicker.tsx
#	apps/web/src/components/chat/ThreadRelationshipsControl.tsx
#	apps/web/src/components/chat/ZoomableImage.tsx
#	apps/web/src/components/chat/composerFocusRedirect.ts
#	apps/web/src/components/chat/useAutoBalanceUpdateBanner.tsx
#	apps/web/src/components/device/DevicePanel.tsx
#	apps/web/src/components/diffs/useReviewFilePatches.ts
#	apps/web/src/components/onboarding/FirstRunGate.tsx
#	apps/web/src/components/preview/PreviewView.tsx
#	apps/web/src/components/projectScriptEditor.tsx
#	apps/web/src/components/pullRequest/LinkPullRequestDialog.tsx
#	apps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsx
#	apps/web/src/components/pullRequest/usePullRequestFilesViewed.browser.test.tsx
#	apps/web/src/components/search/ProjectContentSearchDialog.test.tsx
#	apps/web/src/components/settings/AddProviderInstanceDialog.tsx
#	apps/web/src/components/settings/ConnectionsSettings.tsx
#	apps/web/src/components/settings/DeviceHostsSettings.tsx
#	apps/web/src/components/settings/KeybindingsSettings.tsx
#	apps/web/src/components/settings/ProviderSettingsPanel.tsx
#	apps/web/src/components/settings/ScheduledTasksSettings.tsx
#	apps/web/src/components/settings/SettingsScopeContext.tsx
#	apps/web/src/components/settings/SnapShotSettings.test.tsx
#	apps/web/src/components/settings/SnapShotSettings.tsx
#	apps/web/src/components/settings/StorageSettings.tsx
#	apps/web/src/components/settings/useScopedModelAvailability.ts
#	apps/web/src/components/settings/useScopedSettings.ts
#	apps/web/src/components/settings/useSettingsProjectGroups.ts
#	apps/web/src/components/sidebar/SidebarChrome.tsx
#	apps/web/src/components/sidebar/SidebarUpdateCapsule.tsx
#	apps/web/src/components/sidebar/useUpdateEverything.ts
#	apps/web/src/components/terminal/useThreadTerminalActions.ts
#	apps/web/src/components/usage/UsagePage.tsx
#	apps/web/src/hooks/useHandleNewThread.ts
#	apps/web/src/hooks/usePullRequestLinking.ts
#	apps/web/src/hooks/useSettings.ts
#	apps/web/src/onboarding/firstRun.ts
#	apps/web/src/onboarding/useProjectScans.ts
#	apps/web/src/remoteOpen.ts
#	apps/web/src/state/entities.ts
#	apps/web/src/state/queries.ts
#	apps/web/src/state/session.ts
#	apps/web/src/state/usePullRequestStack.ts
#	apps/web/vite.config.ts
#	docs/internals/web-ui.md
#	oxlint-plugin-t3code/rules/no-manual-memo.test.ts
#	oxlint-plugin-t3code/rules/no-manual-memo.ts
#	packages/client-runtime/package.json
#	packages/client-runtime/src/state/serverConfigProjection.test.ts
#	packages/client-runtime/src/state/serverConfigProjection.ts
#	packages/provider-core/src/server/orchestrationInstructions.ts
#	pnpm-lock.yaml
#	scripts/build-desktop-artifact.test.ts

Co-authored-by: LadyBluenotes <[email protected]>

Copilot AI commented Oct 19, 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 and pushed as feefa7c44. Preserved the documented fork seams, regenerated the route tree with the web build, and passed the requested typechecks.

@LadyBluenotes
LadyBluenotes merged commit c6150b5 into main Oct 24, 2026
@LadyBluenotes
LadyBluenotes deleted the sync/upstream branch October 24, 2026 05:44
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.