Repository navigation
chore: sync upstream pingdotgg/t3code (conflicts) - #161
Merged
Merged
Conversation
Co-authored-by: Claude Opus 5.5 <[email protected]>
… wrong folder (pingdotgg#18549) Co-authored-by: Claude Opus 5.5 <[email protected]>
pingdotgg#20088) Co-authored-by: Claude Opus 5.5 <[email protected]>
…g#20980) Co-authored-by: Paul <paul@local>
pingdotgg#20069) Co-authored-by: Aaron Queen <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#19937) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#19019) Co-authored-by: Claude Opus 5.5 <[email protected]>
…17922) Co-authored-by: Claude Sonnet 5.5 <[email protected]>
…ed to merge (pingdotgg#18232) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
…#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]>
…ingdotgg#14786) Co-authored-by: SAPHID <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…ork advice (pingdotgg#17569) Co-authored-by: Claude Opus 5.5 <[email protected]>
…sh token (pingdotgg#21134) Co-authored-by: Aidid Haiqal <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…no origin (pingdotgg#20412) Co-authored-by: Claude Opus 5.5 <[email protected]>
…pingdotgg#20889) Co-authored-by: Claude Opus 5.5 <[email protected]>
…ingdotgg#16026) Co-authored-by: Arthur Katcher <[email protected]>
…g#18647) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
…report (pingdotgg#15738) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
…ingdotgg#19366) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
…g#14411) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Opus 5.5 <[email protected]>
…ers (pingdotgg#13799) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
…ingdotgg#13359) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
…pingdotgg#21481) Co-authored-by: Claude Opus 5.5 <[email protected]>
…gdotgg#13903) Co-authored-by: Julius Marminge <[email protected]>
…ingdotgg#15044) Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
…14284) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5.1 <[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]>
…otgg#20349) 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]>
…ingdotgg#19648) Co-authored-by: Claude Opus 5.5 <[email protected]> Co-authored-by: Julius Marminge <[email protected]>
…ingdotgg#19968) Co-authored-by: Julius Marminge <[email protected]> Co-authored-by: Claude Fable 5.1 <[email protected]>
…nge (pingdotgg#11013) 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]>
…ill (pingdotgg#20051) 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]>
…le can resume one (pingdotgg#21473) Co-authored-by: Claude Opus 5.5 <[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]>
Owner
Author
|
@copilot resolve the merge conflicts on this pull request by merging Rules:
Conflicting files:
|
# 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]>
Merged |
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/t3codeatd7a8d6f32001444e013aa07c8a468ce3e987f9cfdid not merge automatically.Conflicting files:
apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swiftapps/mobile/package.jsonapps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsxapps/mobile/src/features/home/HomeHeader.tsxapps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsxapps/mobile/src/features/layout/createWorkspaceStackNavigator.ios.tsxapps/mobile/src/features/pull-requests/PullRequestsScreen.tsxapps/mobile/src/features/pull-requests/pullRequestList.test.tsapps/mobile/src/features/threads/ThreadDetailScreen.tsxapps/mobile/src/features/threads/ThreadFeed.tsxapps/mobile/src/features/threads/useThreadHeaderOptions.tsxapps/mobile/src/features/workspace/WorkspaceRootScreen.tsxapps/mobile/src/features/workspace/WorkspaceToolbar.ios.tsxapps/mobile/src/lib/layout.test.tsapps/mobile/src/native/V5StackHeader.ios.tsxapps/mobile/src/native/native-layout-metrics.tsxapps/mobile/src/state/use-thread-composer-state.tsapps/server/src/auth/EnvironmentAuth.test.tsapps/server/src/auth/PairingGrantStore.test.tsapps/server/src/git/GitManager.test.tsapps/server/src/mcp/McpHttpServer.tsapps/server/src/mcp/OrchestratorMcpService.tsapps/server/src/mcp/WorktreeMcpService.test.tsapps/server/src/mcp/WorktreeMcpService.tsapps/server/src/mcp/toolkits/orchestrator/tools.tsapps/server/src/mcp/toolkits/worktree/registration.test.tsapps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.test.tsapps/server/src/orchestration-v2/Adapters/ClaudeAdapterV2.tsapps/server/src/orchestration-v2/CheckpointRestoreSafety.test.tsapps/server/src/orchestration-v2/CheckpointRollbackService.test.tsapps/server/src/orchestration-v2/CheckpointRollbackService.tsapps/server/src/orchestration-v2/CommandPolicy.test.tsapps/server/src/orchestration-v2/Orchestrator.tsapps/server/src/orchestration-v2/ProjectionStore.test.tsapps/server/src/orchestration-v2/ProjectionStore.tsapps/server/src/orchestration-v2/ProviderRuntimeRecoveryService.tsapps/server/src/orchestration-v2/ProviderTurnStartService.test.tsapps/server/src/orchestration-v2/builtInProviderAdapterDrivers.tsapps/server/src/orchestration-v2/testkit/ProviderTurnStartMemory.fixture.mjsapps/server/src/preview/ServerBrowserPage.test.tsapps/server/src/preview/ServerBrowserPage.tsapps/server/src/project/RepositoryIdentityResolver.tsapps/server/src/provider/CodexProvider.tsapps/server/src/provider/ProviderRegistry.test.tsapps/server/src/provider/model-manifest.jsonapps/server/src/provider/providerCompatibility.test.tsapps/server/src/pullRequest/PullRequestService.tsapps/server/src/review/ReviewService.test.tsapps/server/src/scheduledTasks/ScheduledTaskService.tsapps/server/src/scheduledTasks/ScheduledTaskService.webhook.test.tsapps/server/src/scheduledTasks/webhookTemplate.test.tsapps/server/src/scheduledTasks/webhookTemplate.tsapps/server/src/server.tsapps/server/src/serverLogger.test.tsapps/server/src/serverRuntimeStartup.tsapps/server/src/serverSettings.test.tsapps/server/src/storageCleanup.tsapps/server/src/terminal/Manager.test.tsapps/server/src/terminal/nodePtyConsoleList.test.tsapps/server/src/vcs/GitVcsDriverCore.test.tsapps/server/src/vcs/GitVcsDriverCore.tsapps/server/src/workspace/KnownWorkspaces.tsapps/server/src/workspace/WorkspaceFileSystem.tsapps/server/vite.config.tsapps/web/package.jsonapps/web/src/browser/ElectronBrowserHost.tsxapps/web/src/browser/HostedBrowserWebview.tsxapps/web/src/components/BranchToolbar.tsxapps/web/src/components/BranchToolbarBranchSelector.tsxapps/web/src/components/BranchToolbarEnvModeSelector.tsxapps/web/src/components/BranchToolbarEnvironmentSelector.tsxapps/web/src/components/ChatMarkdown.test.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.logic.test.tsapps/web/src/components/ChatView.logic.tsapps/web/src/components/ChatView.tsxapps/web/src/components/CommandPalette.tsxapps/web/src/components/CommandPaletteResults.tsxapps/web/src/components/ComposerPromptEditorTiptap.navigation.browser.test.tsxapps/web/src/components/ComposerPromptEditorTiptap.tsxapps/web/src/components/DiffPanel.tsxapps/web/src/components/DiffWorkerPoolProvider.tsxapps/web/src/components/GitActionsControl.test.tsapps/web/src/components/GitActionsControl.tsxapps/web/src/components/LegacySidebar.tsxapps/web/src/components/PersistentThreadTerminals.tsxapps/web/src/components/ProviderUpdateEnvironmentRows.tsxapps/web/src/components/ProviderUpdateLaunchNotification.environments.tsapps/web/src/components/ProviderUpdateLaunchNotification.tsxapps/web/src/components/ProviderUpdatePrimaryNotification.tsxapps/web/src/components/ProviderUpdatesAction.tsxapps/web/src/components/PullRequestThreadDialog.tsxapps/web/src/components/RightPanelTabs.keyboard.browser.test.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/Sidebar.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/ChangedFilesTree.tsxapps/web/src/components/chat/ChatCanvas.browser.test.tsxapps/web/src/components/chat/ChatComposer.tsxapps/web/src/components/chat/HtmlRenderFrame.tsxapps/web/src/components/chat/MessagesTimeline.logic.tsapps/web/src/components/chat/MessagesTimeline.test.tsxapps/web/src/components/chat/MessagesTimeline.tsxapps/web/src/components/chat/ModelPickerContent.tsxapps/web/src/components/chat/OpenInPicker.tsxapps/web/src/components/chat/QueuedRunsControl.tsxapps/web/src/components/chat/RightPanelSurfaceContent.tsxapps/web/src/components/chat/ThreadDetailsControl.browser.test.tsxapps/web/src/components/chat/ThreadRelationshipsControl.tsxapps/web/src/components/chat/TraitsPicker.tsxapps/web/src/components/chat/WorkLog.browser.test.tsxapps/web/src/components/chat/ZoomableImage.tsxapps/web/src/components/chat/composerFocusRedirect.tsapps/web/src/components/chat/composerProviderState.test.tsxapps/web/src/components/chat/composerProviderState.tsxapps/web/src/components/chat/threadFindHighlights.browser.test.tsxapps/web/src/components/chat/threadFindPosition.browser.test.tsapps/web/src/components/chat/timelineMinimapWheel.browser.test.tsapps/web/src/components/chat/useAutoBalanceUpdateBanner.tsxapps/web/src/components/chat/useChatShortcuts.tsapps/web/src/components/chat/usePendingThreadRequests.tsapps/web/src/components/chat/useQueuedRunEdit.tsapps/web/src/components/chat/useThreadFind.tsapps/web/src/components/chat/useThreadFindNavigation.browser.test.tsxapps/web/src/components/chat/useWorktreeSetup.tsapps/web/src/components/cloud/ConnectOnboardingDialog.tsxapps/web/src/components/desktop/SnapShotCoordinator.tsxapps/web/src/components/device/DevicePanel.tsxapps/web/src/components/diffs/AnnotatableCodeView.tsxapps/web/src/components/diffs/DiffFileTree.tsxapps/web/src/components/diffs/StyledDiffCodeView.test.tsxapps/web/src/components/diffs/useReviewFilePatches.tsapps/web/src/components/files/FileBreadcrumbs.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/fileTreeDragMention.test.tsapps/web/src/components/files/projectFilesQueryState.tsapps/web/src/components/media/MediaVideoPlayer.tsxapps/web/src/components/onboarding/FirstRunGate.tsxapps/web/src/components/onboarding/WelcomeWizard.browser.test.tsxapps/web/src/components/preview/PreviewView.tsxapps/web/src/components/projectScriptEditor.tsxapps/web/src/components/pullRequest/LinkPullRequestDialog.tsxapps/web/src/components/pullRequest/PullRequestCodeTab.tsxapps/web/src/components/pullRequest/PullRequestDetailPanel.tsxapps/web/src/components/pullRequest/ThreadPullRequestsPanel.tsxapps/web/src/components/pullRequest/guide/GuideExcerpt.tsxapps/web/src/components/pullRequest/pullRequestFilesViewed.logic.test.tsapps/web/src/components/pullRequest/pullRequestList.logic.test.tsapps/web/src/components/pullRequest/usePullRequestFilesViewed.test.tsxapps/web/src/components/search/ProjectContentSearchDialog.test.tsxapps/web/src/components/settings/AddProviderInstanceDialog.tsxapps/web/src/components/settings/ConnectionsSettings.tsxapps/web/src/components/settings/DeviceHostsSettings.tsxapps/web/src/components/settings/KeybindingsSettings.tsxapps/web/src/components/settings/ProjectFaviconPickerDialog.tsxapps/web/src/components/settings/ProjectSettingsPanel.tsxapps/web/src/components/settings/ProviderSettingsForm.test.tsapps/web/src/components/settings/ProviderSettingsForm.tsxapps/web/src/components/settings/ProviderSettingsPanel.tsxapps/web/src/components/settings/ScheduledTasksSettings.tsxapps/web/src/components/settings/SettingsPanels.tsxapps/web/src/components/settings/SettingsScopeContext.tsxapps/web/src/components/settings/SnapShotSettings.test.tsxapps/web/src/components/settings/SnapShotSettings.tsxapps/web/src/components/settings/StorageSettings.tsxapps/web/src/components/settings/ThemeImportDialog.tsxapps/web/src/components/settings/useProjectScriptSettings.tsapps/web/src/components/settings/useScopedModelAvailability.tsapps/web/src/components/settings/useScopedSettings.tsapps/web/src/components/settings/useSettingsProjectGroups.tsapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/sidebar/SidebarProviderUpdatePill.tsxapps/web/src/components/sidebar/SidebarUpdateCapsule.tsxapps/web/src/components/sidebar/useUpdateEverything.tsapps/web/src/components/terminal/useThreadTerminalActions.tsapps/web/src/components/ui/sidebar.tsxapps/web/src/components/ui/switch.browser.test.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/components/usage/UsageProviderChart.tsxapps/web/src/composer-list-split.browser.test.tsapps/web/src/composerDraftStore.tsapps/web/src/connection/platform.test.tsapps/web/src/connection/platform.tsapps/web/src/hooks/useHandleNewThread.test.tsapps/web/src/hooks/useHandleNewThread.tsapps/web/src/hooks/useLocalStorage.hook.browser.test.tsxapps/web/src/hooks/useProactivePanels.tsapps/web/src/hooks/usePullRequestLinking.tsapps/web/src/hooks/useSettings.tsapps/web/src/hooks/useTheme.tsapps/web/src/hooks/useThreadActions.tsapps/web/src/lib/composerPathSearchState.tsapps/web/src/lib/editableFocus.browser.test.tsapps/web/src/lib/openPullRequestLink.tsapps/web/src/onboarding/firstRun.tsapps/web/src/onboarding/providerReadiness.logic.test.tsapps/web/src/onboarding/useProjectScans.tsapps/web/src/providerUpdateDismissal.tsapps/web/src/reactCompilerCoverage.test.tsapps/web/src/remoteOpen.tsapps/web/src/routes/_chat.index.tsxapps/web/src/routes/_chat.pull-requests.tsxapps/web/src/session-logic.tsapps/web/src/shortcutModifierState.browser.test.tsapps/web/src/state/entities.tsapps/web/src/state/queries.tsapps/web/src/state/session.tsapps/web/src/state/usePullRequestStack.tsdocs/internals/web-ui.mdoxlint-plugin-t3code/rules/no-manual-memo.test.tsoxlint-plugin-t3code/rules/no-manual-memo.tspackages/client-runtime/package.jsonpackages/client-runtime/src/authorization/layer.test.tspackages/client-runtime/src/connection/outdatedHostUpdate.tspackages/client-runtime/src/connection/registry.test.tspackages/client-runtime/src/connection/routes.test.tspackages/client-runtime/src/pullRequestQuery.test.tspackages/client-runtime/src/state/commandPermissions.test.tspackages/client-runtime/src/state/composerDispatch.test.tspackages/client-runtime/src/state/serverConfigProjection.test.tspackages/client-runtime/src/state/serverConfigProjection.tspackages/client-runtime/src/state/shellReducer.test.tspackages/client-runtime/src/state/threadDetail.tspackages/client-runtime/src/state/threadSubagents.test.tspackages/contracts/src/clientRpcPermissions.tspackages/contracts/src/rpc.test.tspackages/contracts/src/settings.test.tspackages/contracts/src/worktreeMcp.tspackages/provider-core/src/server/orchestrationInstructions.tspackages/shared/src/cliRelease.test.tspackages/shared/src/cliRelease.tspackages/shared/src/orchestrationV2PendingBackgroundWork.test.tspackages/source-control-github/src/server/GitHubSourceControlProvider.test.tspackages/source-control-gitlab/src/server/GitLabCli.test.tspackages/ssh/src/command.test.tspackages/ssh/src/tunnel.test.tspatches/[email protected]pnpm-lock.yamlpnpm-workspace.yamlscripts/build-desktop-artifact.test.tsthird-party-licenses.config.jsonvite.config.tsResolve the conflicts on this pull request, or merge
sync/upstreamintomainlocally and push. The next nightly run closes this oncemaincontains upstream.