T3-Turbo rebase needs review: v0.0.42

[github-actions]

T3-Turbo nightly rebase needs review

• Previous official nightly: v0.0.33-nightly.20260809.1042 (1a003e383ac6b10258b8100c2617d938c4f06c69)
• Candidate official nightly: v0.0.42 (official v0.0.34-nightly.20260812.1072 plus upstream main) (560d4a4560ddb5f42c8f8e0e35fa7827c0e46f80)

The automation stopped without resolving or publishing anything.

Files changed by both upstream and Turbo

• .github/workflows/mobile-eas-production.yml
• .github/workflows/mobile-fingerprint-check.yml
• .github/workflows/release.yml
• apps/desktop/package.json
• apps/desktop/src/electron/ElectronDialog.test.ts
• apps/desktop/src/electron/ElectronDialog.ts
• apps/desktop/src/ipc/DesktopIpcHandlers.ts
• apps/desktop/src/ipc/channels.ts
• apps/desktop/src/ipc/methods/window.ts
• apps/desktop/src/preload.ts
• apps/desktop/src/shell/DesktopShellEnvironment.test.ts
• apps/desktop/src/shell/DesktopShellEnvironment.ts
• apps/desktop/src/window/DesktopApplicationMenu.test.ts
• apps/mobile/app.config.ts
• apps/mobile/plugins/withAndroidTabletOrientation.cjs
• apps/mobile/src/components/ControlPill.tsx
• apps/mobile/src/features/settings/SettingsRouteScreen.tsx
• apps/mobile/src/features/threads/ThreadComposer.tsx
• apps/mobile/src/features/threads/ThreadDetailScreen.tsx
• apps/mobile/src/features/threads/ThreadFeed.tsx
• apps/mobile/src/lib/threadActivity.ts
• apps/mobile/src/lib/wideMarkdownBlocks.test.ts
• apps/mobile/src/lib/wideMarkdownBlocks.ts
• apps/server/package.json
• apps/server/src/auth/RpcAuthorization.test.ts
• apps/server/src/auth/RpcAuthorization.ts
• apps/server/src/cloud/bootService.test.ts
• apps/server/src/cloud/pinnedRuntime.test.ts
• apps/server/src/cloud/selfUpdate.test.ts
• apps/server/src/environment/ServerEnvironment.test.ts
• apps/server/src/environment/ServerEnvironment.ts
• apps/server/src/environment/ServerEnvironmentLabel.test.ts
• apps/server/src/git/GitManager.test.ts
• apps/server/src/git/GitManager.ts
• apps/server/src/http.test.ts
• apps/server/src/http.ts
• apps/server/src/processRunner.ts
• apps/server/src/project/ProjectFaviconResolver.test.ts
• apps/server/src/project/ProjectFaviconResolver.ts
• apps/server/src/pullRequest/AzureDevOpsPullRequestCli.test.ts
• apps/server/src/pullRequest/AzureDevOpsPullRequestCli.ts
• apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.test.ts
• apps/server/src/pullRequest/AzureDevOpsPullRequestProvider.ts
• apps/server/src/pullRequest/BitbucketPullRequestApi.test.ts
• apps/server/src/pullRequest/BitbucketPullRequestApi.ts
• apps/server/src/pullRequest/BitbucketPullRequestProvider.test.ts
• apps/server/src/pullRequest/BitbucketPullRequestProvider.ts
• apps/server/src/pullRequest/GitHubPullRequestCli.test.ts
• apps/server/src/pullRequest/GitHubPullRequestCli.ts
• apps/server/src/pullRequest/GitHubPullRequestProvider.test.ts
• apps/server/src/pullRequest/GitHubPullRequestProvider.ts
• apps/server/src/pullRequest/GitLabPullRequestCli.test.ts
• apps/server/src/pullRequest/GitLabPullRequestCli.ts
• apps/server/src/pullRequest/GitLabPullRequestProvider.test.ts
• apps/server/src/pullRequest/GitLabPullRequestProvider.ts
• apps/server/src/pullRequest/PullRequestProvider.ts
• apps/server/src/pullRequest/PullRequestProviderRegistry.ts
• apps/server/src/pullRequest/PullRequestService.test.ts
• apps/server/src/pullRequest/PullRequestService.ts
• apps/server/src/pullRequest/azureDevOpsPullRequestJson.test.ts
• apps/server/src/pullRequest/azureDevOpsPullRequestJson.ts
• apps/server/src/pullRequest/bitbucketPullRequestJson.test.ts
• apps/server/src/pullRequest/bitbucketPullRequestJson.ts
• apps/server/src/pullRequest/gitHubPullRequestJson.test.ts
• apps/server/src/pullRequest/gitHubPullRequestJson.ts
• apps/server/src/pullRequest/gitLabMergeRequestJson.test.ts
• apps/server/src/pullRequest/gitLabMergeRequestJson.ts
• apps/server/src/pullRequest/http.ts
• apps/server/src/server.test.ts
• apps/server/src/server.ts
• apps/server/src/sourceControl/BitbucketApi.test.ts
• apps/server/src/sourceControl/BitbucketApi.ts
• apps/server/src/sourceControl/GitHubCli.ts
• apps/server/src/sourceControl/GitLabCli.ts
• apps/server/src/sourceControl/azureDevOpsPullRequests.ts
• apps/server/src/stream/collectUint8StreamText.test.ts
• apps/server/src/stream/collectUint8StreamText.ts
• apps/server/src/usage/usageScanCache.ts
• apps/server/src/usage/usageTranscripts.test.ts
• apps/server/src/usage/usageTranscripts.ts
• apps/server/src/vcs/GitVcsDriver.ts
• apps/server/src/vcs/GitVcsDriverCore.ts
• apps/server/src/vcs/VcsProcess.test.ts
• apps/server/src/vcs/VcsProcess.ts
• apps/server/src/ws.ts
• apps/web/index.html
• apps/web/package.json
• apps/web/src/components/AppSidebarLayout.tsx
• apps/web/src/components/BranchToolbar.tsx
• apps/web/src/components/BranchToolbarBranchSelector.tsx
• apps/web/src/components/BranchToolbarEnvModeSelector.tsx
• apps/web/src/components/ChatMarkdown.tsx
• apps/web/src/components/ChatView.logic.ts
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/CommandPalette.tsx
• apps/web/src/components/ConfirmDialogHost.tsx
• apps/web/src/components/DiffPanel.tsx
• apps/web/src/components/GitActionsControl.tsx
• apps/web/src/components/LegacySidebar.tsx
• apps/web/src/components/RightPanelTabs.tsx
• apps/web/src/components/Sidebar.logic.ts
• apps/web/src/components/Sidebar.snooze.test.ts
• apps/web/src/components/Sidebar.tsx
• apps/web/src/components/WorkspaceBreadcrumb.tsx
• apps/web/src/components/chat/ChatComposer.tsx
• apps/web/src/components/chat/ChatHeader.tsx
• apps/web/src/components/chat/ComposerPrimaryActions.test.ts
• apps/web/src/components/chat/ComposerPrimaryActions.tsx
• apps/web/src/components/chat/DraftHeroHeadline.tsx
• apps/web/src/components/chat/ModelPickerSidebar.tsx
• apps/web/src/components/chat/PanelLayoutControls.tsx
• apps/web/src/components/chat/TraitsPicker.tsx
• apps/web/src/components/clerk/authRedirect.test.ts
• apps/web/src/components/clerk/authRedirect.ts
• apps/web/src/components/diffs/AnnotatableCodeView.test.tsx
• apps/web/src/components/diffs/AnnotatableCodeView.tsx
• apps/web/src/components/diffs/DiffCommentAnnotation.test.tsx
• apps/web/src/components/diffs/DiffCommentAnnotation.tsx
• apps/web/src/components/diffs/StyledDiffCodeView.test.tsx
• apps/web/src/components/diffs/StyledDiffCodeView.tsx
• apps/web/src/components/diffs/commentSubmitShortcut.test.ts
• apps/web/src/components/diffs/commentSubmitShortcut.ts
• apps/web/src/components/files/FilePreviewPanel.tsx
• apps/web/src/components/preview/PreviewPanelShell.tsx
• apps/web/src/components/pullRequest/PullRequestActivityUnavailableState.tsx
• apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
• apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
• apps/web/src/components/pullRequest/PullRequestGhosts.tsx
• apps/web/src/components/pullRequest/PullRequestListEmptyState.test.tsx
• apps/web/src/components/pullRequest/PullRequestListEmptyState.tsx
• apps/web/src/components/pullRequest/PullRequestListFilters.test.tsx
• apps/web/src/components/pullRequest/PullRequestListFilters.tsx
• apps/web/src/components/pullRequest/PullRequestMarkdown.tsx
• apps/web/src/components/pullRequest/PullRequestReviewAnnotation.tsx
• apps/web/src/components/pullRequest/PullRequestReviewBar.tsx
• apps/web/src/components/pullRequest/PullRequestReviewerPicker.tsx
• apps/web/src/components/pullRequest/PullRequestRow.tsx
• apps/web/src/components/pullRequest/PullRequestSummaryTab.tsx
• apps/web/src/components/pullRequest/PullRequestTimelineTab.tsx
• apps/web/src/components/pullRequest/PullRequestsUnavailableState.test.tsx
• apps/web/src/components/pullRequest/PullRequestsUnavailableState.tsx
• apps/web/src/components/pullRequest/pullRequestDetail.logic.test.ts
• apps/web/src/components/pullRequest/pullRequestDetail.logic.ts
• apps/web/src/components/pullRequest/pullRequestDiff.logic.test.ts
• apps/web/src/components/pullRequest/pullRequestDiff.logic.ts
• apps/web/src/components/pullRequest/pullRequestList.logic.test.ts
• apps/web/src/components/pullRequest/pullRequestList.logic.ts
• apps/web/src/components/pullRequest/pullRequestMarkdown.logic.test.ts
• apps/web/src/components/pullRequest/pullRequestMarkdown.logic.ts
• apps/web/src/components/pullRequest/pullRequestPresentation.tsx
• apps/web/src/components/pullRequest/pullRequestReviewStore.test.ts
• apps/web/src/components/pullRequest/pullRequestReviewStore.ts
• apps/web/src/components/settings/DiagnosticsSettings.tsx
• apps/web/src/components/settings/ProjectSettingsPanel.tsx
• apps/web/src/components/settings/ProviderInstanceCard.tsx
• apps/web/src/components/settings/ResourceTelemetryDiagnostics.tsx
• apps/web/src/components/settings/SettingsBreadcrumb.tsx
• apps/web/src/components/settings/SettingsPanels.tsx
• apps/web/src/components/settings/SettingsSidebarNav.tsx
• apps/web/src/components/settings/ThemeImportDialog.tsx
• apps/web/src/components/settings/ThemeSettings.tsx
• apps/web/src/components/settings/settingsLayout.tsx
• apps/web/src/components/settings/settingsSearch.test.ts
• apps/web/src/components/settings/settingsSearch.ts
• apps/web/src/components/settings/themeInspector.test.ts
• apps/web/src/components/settings/themeInspector.ts
• apps/web/src/components/sidebar/SidebarChrome.tsx
• apps/web/src/components/sidebar/SidebarProviderUpdatePill.tsx
• apps/web/src/components/sidebar/SidebarUpdatePill.tsx
• apps/web/src/components/ui/skeleton.tsx
• apps/web/src/components/usage/UsagePage.tsx
• apps/web/src/confirmDialog.test.ts
• apps/web/src/confirmDialog.ts
• apps/web/src/connection/runtime.ts
• apps/web/src/hooks/useHandleNewThread.ts
• apps/web/src/hooks/useLiveRefresh.test.ts
• apps/web/src/hooks/useLiveRefresh.ts
• apps/web/src/hooks/useThreadActionMenu.ts
• apps/web/src/hooks/useThreadActions.ts
• apps/web/src/index.css
• apps/web/src/lib/chatThreadActions.ts
• apps/web/src/lib/diffFileContents.test.ts
• apps/web/src/lib/diffFileContents.ts
• apps/web/src/lib/diffRendering.ts
• apps/web/src/lib/openPullRequestLink.test.ts
• apps/web/src/lib/openPullRequestLink.ts
• apps/web/src/localApi.test.ts
• apps/web/src/localApi.ts
• apps/web/src/markdown-github-alerts.test.tsx
• apps/web/src/markdown-github-alerts.ts
• apps/web/src/reviewCommentContext.test.ts
• apps/web/src/reviewCommentContext.ts
• apps/web/src/rightPanelStore.test.ts
• apps/web/src/rightPanelStore.ts
• apps/web/src/routeTree.gen.ts
• apps/web/src/routes/__root.tsx
• apps/web/src/routes/_chat.pull-requests.tsx
• apps/web/src/routes/projects.$projectKey.tsx
• apps/web/src/routes/settings.projects.tsx
• apps/web/src/routes/settings.projects_.$projectKey.tsx
• apps/web/src/routes/settings.tsx
• apps/web/src/sourceControlPresentation.ts
• apps/web/src/state/pullRequests.ts
• apps/web/src/state/queries.ts
• apps/web/src/themePalette.test.ts
• apps/web/src/themePalette.ts
• docs/README.md
• docs/user/source-control.md
• packages/client-runtime/package.json
• packages/client-runtime/src/rpc/http.ts
• packages/client-runtime/src/state/projectGrouping.test.ts
• packages/client-runtime/src/state/projectGrouping.ts
• packages/client-runtime/src/state/pullRequestDiffHttp.test.ts
• packages/client-runtime/src/state/pullRequestDiffHttp.ts
• packages/client-runtime/src/state/pullRequests.ts
• packages/client-runtime/src/state/runtime.ts
• packages/client-runtime/src/state/threadSettled.ts
• packages/client-runtime/src/state/threadSnoozed.test.ts
• packages/contracts/package.json
• packages/contracts/src/environment.test.ts
• packages/contracts/src/environment.ts
• packages/contracts/src/environmentHttp.ts
• packages/contracts/src/git.ts
• packages/contracts/src/index.ts
• packages/contracts/src/ipc.ts
• packages/contracts/src/pullRequest.test.ts
• packages/contracts/src/pullRequest.ts
• packages/contracts/src/rpc.ts
• packages/shared/src/composerInlineTokens.test.ts
• packages/shared/src/composerInlineTokens.ts
• packages/shared/src/shell.test.ts
• packages/shared/src/shell.ts
• pnpm-lock.yaml
• pnpm-workspace.yaml
• vite.config.ts

Unmerged paths reported by Git

• docs/README.md

Rebase error

Rebasing (1/128)
Rebasing (2/128)
error: could not apply 0fd4e6b2... docs(turbo): record fork policy, seams, and operator runbooks
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Could not apply 0fd4e6b2... # docs(turbo): record fork policy, seams, and operator runbooks

Review and retry

• Open this Actions run
• Open the manual build page
• Create repair/turbo-nightly-31552658971 from the unchanged turbo branch.
• Replay or amend the Turbo customization that collided, run the manifest verifier and its focused seam tests, then open a reviewed PR back to turbo.
• If the workflow changes, land the identical workflow blob on main before retrying. Do not hand-edit the upstream checkpoint or publish partial artifacts.
• CLI retry: gh workflow run turbo-nightly-sync.yml -R gfsaaser24/t3code --ref main