Skip to content

T3-Turbo rebase needs review: v0.0.32-nightly.20260807.1019.turbo.20260806.33 #34

Description

@github-actions

T3-Turbo nightly rebase needs review

  • Previous official nightly: v0.0.32-nightly.20260805.1002 (3d429662c9bd7b731c059dc3a84ccdfc43bf3701)
  • Candidate official nightly: v0.0.32-nightly.20260807.1019.turbo.20260806.33 (official v0.0.32-nightly.20260807.1019 plus upstream main) (6b73b3defe1dfb365de3b7bbb97ca56a26b50a43)

The automation stopped without resolving or publishing anything.

Files changed by both upstream and Turbo

  • .github/workflows/release.yml
  • apps/mobile/src/Stack.tsx
  • apps/mobile/src/components/AndroidScreenHeader.tsx
  • apps/mobile/src/features/home/HomeScreen.tsx
  • apps/mobile/src/features/home/home-list-options.ts
  • apps/mobile/src/features/home/homeThreadList.test.ts
  • apps/mobile/src/features/home/homeThreadList.ts
  • apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.tsx
  • apps/mobile/src/features/settings/SettingsAppearanceRouteScreen.tsx
  • apps/mobile/src/features/settings/SettingsProjectGroupingRouteScreen.tsx
  • apps/mobile/src/features/settings/SettingsRouteScreen.tsx
  • apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx
  • apps/mobile/src/features/settings/components/settings-sheet-targets.ts
  • apps/mobile/src/features/threads/NewTaskDraftScreen.tsx
  • apps/mobile/src/features/threads/NewTaskRouteScreen.tsx
  • apps/mobile/src/features/threads/new-task-flow-provider.tsx
  • apps/mobile/src/features/threads/new-task-project-selection.test.ts
  • apps/mobile/src/features/threads/new-task-project-selection.ts
  • apps/mobile/src/features/threads/thread-list-v2-items.tsx
  • apps/mobile/src/lib/repositoryGroups.test.ts
  • apps/mobile/src/lib/repositoryGroups.ts
  • apps/mobile/src/lib/threadActivity.test.ts
  • apps/mobile/src/lib/threadActivity.ts
  • apps/mobile/src/persistence/mobile-preferences.ts
  • apps/mobile/src/state/project-grouping.logic.ts
  • apps/mobile/src/state/project-grouping.test.ts
  • apps/mobile/src/state/project-grouping.ts
  • apps/server/integration/OrchestrationEngineHarness.integration.ts
  • apps/server/src/auth/RpcAuthorization.ts
  • apps/server/src/cloud/bootService.ts
  • apps/server/src/orchestration/ActivityPayloadProjection.test.ts
  • apps/server/src/orchestration/Layers/CheckpointReactor.test.ts
  • apps/server/src/orchestration/Layers/OrchestrationEngine.test.ts
  • apps/server/src/orchestration/Layers/ProjectionPipeline.test.ts
  • apps/server/src/orchestration/Layers/ProjectionPipeline.ts
  • apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.test.ts
  • apps/server/src/orchestration/Layers/ProjectionSnapshotQuery.ts
  • apps/server/src/orchestration/Layers/ProviderCommandReactor.test.ts
  • apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.test.ts
  • apps/server/src/orchestration/Layers/ProviderRuntimeIngestion.ts
  • apps/server/src/orchestration/ThreadBackgroundLiveness.test.ts
  • apps/server/src/orchestration/ThreadBackgroundLiveness.ts
  • apps/server/src/orchestration/runtimeLayer.ts
  • apps/server/src/orchestration/workflowScriptQuery.test.ts
  • apps/server/src/orchestration/workflowScriptQuery.ts
  • apps/server/src/provider/Layers/ClaudeAdapter.test.ts
  • apps/server/src/provider/Layers/ClaudeAdapter.ts
  • apps/server/src/provider/Layers/CodexAdapter.ts
  • apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts
  • apps/server/src/provider/Layers/CodexCollabWire.test.ts
  • apps/server/src/provider/Layers/CodexSessionRuntime.ts
  • apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs
  • apps/server/src/provider/testFixtures/codexCollabMockPeer.sh
  • apps/server/src/provider/testFixtures/codexMultiAgentWire.json
  • apps/server/src/server.test.ts
  • apps/server/src/server.ts
  • apps/server/src/serviceLauncher.ts
  • apps/server/src/vcs/GitVcsDriver.ts
  • apps/server/src/ws.ts
  • apps/web/src/appearanceFonts.test.ts
  • apps/web/src/appearanceFonts.ts
  • apps/web/src/components/AgentsPanel.tsx
  • apps/web/src/components/BranchToolbar.tsx
  • apps/web/src/components/ChatMarkdown.tsx
  • apps/web/src/components/ChatView.tsx
  • apps/web/src/components/CommandPalette.tsx
  • apps/web/src/components/ComposerPromptEditor.tsx
  • apps/web/src/components/RightPanelTabs.tsx
  • apps/web/src/components/Sidebar.logic.ts
  • apps/web/src/components/SidebarV2.tsx
  • apps/web/src/components/ThreadTerminalDrawer.tsx
  • apps/web/src/components/chat/ChatComposer.tsx
  • apps/web/src/components/chat/DraftHeroHeadline.tsx
  • apps/web/src/components/chat/MessagesTimeline.logic.ts
  • apps/web/src/components/chat/MessagesTimeline.tsx
  • apps/web/src/components/chat/ModelPickerContent.tsx
  • apps/web/src/components/settings/ConnectionsSettings.tsx
  • apps/web/src/components/settings/FontFamilyPicker.tsx
  • apps/web/src/components/settings/SettingsFontPreviews.tsx
  • apps/web/src/components/settings/SettingsPanels.tsx
  • apps/web/src/components/sidebar/SidebarUpdatePill.tsx
  • apps/web/src/logicalProject.ts
  • apps/web/src/rightPanelStore.ts
  • apps/web/src/session-logic.test.ts
  • apps/web/src/session-logic.ts
  • apps/web/src/sidebarProjectGrouping.ts
  • apps/web/src/terminal/ghostty/renderer.test.ts
  • apps/web/src/terminal/ghostty/renderer.ts
  • apps/web/src/terminal/ghostty/surface.test.ts
  • apps/web/src/terminal/ghostty/surface.ts
  • docs/operations/release.md
  • packages/client-runtime/package.json
  • packages/client-runtime/src/state/orchestration.ts
  • packages/client-runtime/src/state/projectGrouping.test.ts
  • packages/client-runtime/src/state/projectGrouping.ts
  • packages/client-runtime/src/state/server.test.ts
  • packages/client-runtime/src/state/server.ts
  • packages/client-runtime/src/state/subagentRuntime.test.ts
  • packages/client-runtime/src/state/subagentRuntime.ts
  • packages/client-runtime/src/state/threadSearch.test.ts
  • packages/client-runtime/src/state/threadSearch.ts
  • packages/contracts/src/orchestration.ts
  • packages/contracts/src/providerRuntime.test.ts
  • packages/contracts/src/providerRuntime.ts
  • packages/contracts/src/rpc.ts
  • scripts/mobile-showcase-environment.ts

Unmerged paths reported by Git

  • apps/web/src/components/ChatMarkdown.tsx

Rebase error

Rebasing (1/155)
Rebasing (2/155)
Rebasing (3/155)
Rebasing (4/155)
Rebasing (5/155)
Rebasing (6/155)
Rebasing (7/155)
Rebasing (8/155)
Rebasing (9/155)
Rebasing (10/155)
Rebasing (11/155)
Rebasing (12/155)
Rebasing (13/155)
Rebasing (14/155)
Rebasing (15/155)
Rebasing (16/155)
Rebasing (17/155)
Rebasing (18/155)
Rebasing (19/155)
Rebasing (20/155)
Rebasing (21/155)
Rebasing (22/155)
Rebasing (23/155)
Rebasing (24/155)
Rebasing (25/155)
Rebasing (26/155)
Rebasing (27/155)
Rebasing (28/155)
Rebasing (29/155)
Rebasing (30/155)
Rebasing (31/155)
Rebasing (32/155)
Rebasing (33/155)
Rebasing (34/155)
Rebasing (35/155)
Rebasing (36/155)
Rebasing (37/155)
Rebasing (38/155)
Rebasing (39/155)
Rebasing (40/155)
Rebasing (41/155)
Rebasing (42/155)
Rebasing (43/155)
Rebasing (44/155)
Rebasing (45/155)
Rebasing (46/155)
Rebasing (47/155)
Rebasing (48/155)
Rebasing (49/155)
error: could not apply 58b79f81... feat(web): add Markdown file opening controls
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 58b79f81... # feat(web): add Markdown file opening controls

Review and retry

  • Open this Actions run
  • Open the manual build page
  • Create repair/turbo-nightly-31148376024 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

Metadata

Metadata

Assignees

Labels

No labels
No labels

Projects

No projects

Milestone

No milestone

Relationships

None yet

Development

No branches or pull requests

Issue actions