Automatic upstream detection reached conflicted and stopped before any mutation.
| field |
value |
target main |
133f3f735e3bc45def51d989b83a83df55d2a510 |
source main |
f94a0d646ed78a4788e4af6417f74202a628a5e9 |
| merge base |
f035a0f4cdf4abaa6704673af7b5a4a321149ba2 |
| upstream commits |
60 |
| changed paths |
409 |
Conflicting paths
apps/mobile/app.config.tsapps/mobile/src/components/CompactBrandTitle.tsxapps/mobile/src/components/T3Wordmark.tsxapps/mobile/src/features/home/HomeHeader.tsxapps/mobile/src/lib/authClientMetadata.tsapps/mobile/src/lib/mobileBranding.test.tsapps/server/src/cloud/bootService.test.tsapps/server/src/cloud/bootService.tsapps/server/src/environment/ServerEnvironment.test.tsapps/server/src/environment/ServerEnvironment.tsapps/server/src/persistence/Migrations.tsapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/OpenInPicker.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/threadSidebarWidth.test.tsapps/web/src/connection/platform.tsoxlint-plugin-marcode/rules/no-mobile-uniwind-theme-escape-hatches.test.tsoxlint-plugin-marcode/rules/no-mobile-uniwind-theme-escape-hatches.tspackages/contracts/src/environment.tspnpm-lock.yamlscripts/build-desktop-artifact.test.tsvite.config.ts
Hotspot matches
apps/mobile/app.config.ts — owner mobile (Native client and Marcode branding)apps/mobile/assets/android-icon-foreground.png — owner mobile (Native client and Marcode branding)apps/mobile/assets/android-icon-foreground.svg — owner mobile (Native client and Marcode branding)apps/mobile/generated-uniwind-default-theme-variables.json — owner mobile (Native client and Marcode branding)apps/mobile/generated-uniwind-theme-names.json — owner mobile (Native client and Marcode branding)apps/mobile/generated-uniwind-themes.css — owner mobile (Native client and Marcode branding)apps/mobile/global.css — owner mobile (Native client and Marcode branding)apps/mobile/metro.config.js — owner mobile (Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts — owner mobile (Native client and Marcode branding)apps/mobile/package.json — owner mobile (Native client and Marcode branding)apps/mobile/scripts/generate-uniwind-themes.mts — owner mobile (Native client and Marcode branding)apps/mobile/scripts/generate-uniwind-themes.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/App.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/AndroidAnchoredMenu.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/AndroidScreenHeader.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/AppSymbol.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/CompactBrandTitle.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ComposerAttachmentStrip.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ComposerToolbar.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ConfirmDialogHost.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ControlPill.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ErrorBanner.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/GlassSafeAreaView.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/GlassSurface.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/LoadingScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/PierreEntryIcon.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ProjectFavicon.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/SourceControlIcon.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/T3Wordmark.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/components/ThemedSwitch.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/cloud/linkEnvironment.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/CloudEnvironmentRows.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionSheetButton.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionsRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/EnvironmentConnectionNotice.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/connection/connectionTone.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/FileMarkdownPreview.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/FileTreeBrowser.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/SourceFileSurface.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/files/thread-file-navigator-pane.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/home/AndroidHomeFab.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/home/HomeHeader.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/home/HomeScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/layout/WorkspaceEmptyDetail.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/layout/workspace-pane-divider.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/review/ReviewSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/review/nativeReviewDiffAdapter.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/review/useNativeReviewDiffBridge.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/SettingsProjectGroupingRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/appearance/AppearancePreferencesProvider.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/appearance/useScaledTextRole.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsLegalDocumentRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsRow.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/terminal/ThreadTerminalPanel.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/ComposerCommandPopover.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/GitActionProgressOverlay.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskDraftScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskRouteScreen.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/PendingApprovalCard.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/PendingUserInputCard.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/ThreadComposer.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/ThreadFeed.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/ThreadSettingsSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/git/GitCommitSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/git/GitOverviewSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/git/gitSheetComponents.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-filter-button.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-header-actions.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-navigation-shell.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-list-items.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-list-v2-items.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-search-match.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-work-log.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/threadPresentation.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/usage/usageProviders.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/authClientMetadata.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/connection.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/connection.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/markdownLinks.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileBranding.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.test-support.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileThemeRuntime.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileThemeRuntime.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileThemeVariables.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/mobileThemeVariables.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/storage.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/threadActivity.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/threadActivity.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/useFontFamily.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/useMobileNavigationTheme.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/useThemeColor.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/useUniwindTheme.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.ios.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.native.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/state/thread-pr-presentation.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/use-thread-pr.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/use-thread-pr.ts — owner mobile (Native client and Marcode branding)apps/mobile/uniwind-types.d.ts — owner mobile (Native client and Marcode branding)apps/server/src/cloud/bootService.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/persistence/Migrations.ts — owner persistence (Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)apps/server/src/provider/Drivers/ClaudeDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Drivers/CodexDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokSkills.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokSkills.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeAdapter.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeProvider.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexAdapter.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexCollabWire.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexSessionRuntime.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/CursorAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokAdapter.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderRegistry.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderService.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderService.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/ModelManifest.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/ModelManifest.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpRuntimeModel.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpRuntimeModel.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpSessionRuntime.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpCliProbe.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpSupport.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpSupport.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/XAiAcpExtension.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/acp/XAiAcpExtension.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/model-manifest.json — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.cliParsers.test.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs — owner provider-runtime (Provider-specific Marcode behavior)apps/web/src/components/ChatView.tsx — owner web-runtime (Marcode workspace, terminal, and browser integration)apps/web/src/components/Sidebar.logic.test.ts — owner web-navigation (Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.logic.ts — owner web-navigation (Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.tsx — owner web-navigation (Marcode unified project workspace and thread navigation)apps/web/src/components/chat/ChatComposer.tsx — owner web-shell (Marcode floating glass composer)apps/web/src/components/sidebar/SidebarChrome.tsx — owner web-navigation (Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)apps/web/src/index.css — owner design-system (Marcode visual tokens and chrome)assets/README.md — owner release-branding (Release channel and product assets)packages/contracts/src/settings.test.ts — owner web-navigation (Marcode navigation and unified-workspace rollout settings)packages/contracts/src/settings.ts — owner web-navigation (Marcode navigation and unified-workspace rollout settings)
Reproduce locally (read-only, disposable worktree)
The bot did not resolve conflicts, did not push an integration branch, and did not open a
pull request. Resolve this by hand: see docs/operations/upstream-sync.md.
Automatic upstream detection reached
conflictedand stopped before any mutation.main133f3f735e3bc45def51d989b83a83df55d2a510mainf94a0d646ed78a4788e4af6417f74202a628a5e9f035a0f4cdf4abaa6704673af7b5a4a321149ba2Conflicting paths
apps/mobile/app.config.tsapps/mobile/src/components/CompactBrandTitle.tsxapps/mobile/src/components/T3Wordmark.tsxapps/mobile/src/features/home/HomeHeader.tsxapps/mobile/src/lib/authClientMetadata.tsapps/mobile/src/lib/mobileBranding.test.tsapps/server/src/cloud/bootService.test.tsapps/server/src/cloud/bootService.tsapps/server/src/environment/ServerEnvironment.test.tsapps/server/src/environment/ServerEnvironment.tsapps/server/src/persistence/Migrations.tsapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/OpenInPicker.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/threadSidebarWidth.test.tsapps/web/src/connection/platform.tsoxlint-plugin-marcode/rules/no-mobile-uniwind-theme-escape-hatches.test.tsoxlint-plugin-marcode/rules/no-mobile-uniwind-theme-escape-hatches.tspackages/contracts/src/environment.tspnpm-lock.yamlscripts/build-desktop-artifact.test.tsvite.config.tsHotspot matches
apps/mobile/app.config.ts— ownermobile(Native client and Marcode branding)apps/mobile/assets/android-icon-foreground.png— ownermobile(Native client and Marcode branding)apps/mobile/assets/android-icon-foreground.svg— ownermobile(Native client and Marcode branding)apps/mobile/generated-uniwind-default-theme-variables.json— ownermobile(Native client and Marcode branding)apps/mobile/generated-uniwind-theme-names.json— ownermobile(Native client and Marcode branding)apps/mobile/generated-uniwind-themes.css— ownermobile(Native client and Marcode branding)apps/mobile/global.css— ownermobile(Native client and Marcode branding)apps/mobile/metro.config.js— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/markdownLinks.ts— ownermobile(Native client and Marcode branding)apps/mobile/package.json— ownermobile(Native client and Marcode branding)apps/mobile/scripts/generate-uniwind-themes.mts— ownermobile(Native client and Marcode branding)apps/mobile/scripts/generate-uniwind-themes.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/App.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/AndroidAnchoredMenu.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/AndroidScreenHeader.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/AppSymbol.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/CompactBrandTitle.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ComposerAttachmentStrip.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ComposerToolbar.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ConfirmDialogHost.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ControlPill.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ErrorBanner.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/GlassSafeAreaView.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/GlassSurface.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/LoadingScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/PierreEntryIcon.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ProjectFavicon.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/SourceControlIcon.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/T3Wordmark.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ThemedSwitch.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/archive/ArchivedThreadsScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/cloud/linkEnvironment.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/CloudEnvironmentRows.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionEnvironmentRow.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionSheetButton.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionsRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/EnvironmentConnectionNotice.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/connectionTone.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/FileMarkdownPreview.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/FileTreeBrowser.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/SourceFileSurface.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/ThreadFilesRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/thread-file-navigator-pane.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/AndroidHomeFab.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeHeader.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/WorkspaceConnectionTitle.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/layout/WorkspaceEmptyDetail.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/layout/workspace-pane-divider.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/review/ReviewCommentComposerSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/review/ReviewSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/review/nativeReviewDiffAdapter.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/review/nativeReviewDiffAdapter.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/review/useNativeReviewDiffBridge.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsClientStorageRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsEnvironmentsRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsProjectGroupingRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/appearance/AppearancePreferencesProvider.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/appearance/components/AppearancePreviews.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/appearance/components/FontSizeSliderRow.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/appearance/sections/ThemeAppearanceSection.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/appearance/useScaledTextRole.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsLegalDocumentRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsRow.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/components/SettingsSwitchRow.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/terminal/ThreadTerminalPanel.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ComposerCommandPopover.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/GitActionProgressOverlay.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskContextPickerScreens.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskDraftScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/NewTaskRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/PendingApprovalCard.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/PendingUserInputCard.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadComposer.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadFeed.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadNavigationSidebar.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadSettingsSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/git/GitCommitSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/git/GitOverviewSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/git/gitSheetComponents.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-filter-button.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-header-actions.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-navigation-shell.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-list-items.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-list-v2-items.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-search-match.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-work-log.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/threadListV2.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/threadPresentation.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/usage/usageProviders.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/authClientMetadata.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/connection.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/connection.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/markdownLinks.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileBranding.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.test-support.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileTheme.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileThemeRuntime.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileThemeRuntime.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileThemeVariables.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/mobileThemeVariables.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/storage.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/threadActivity.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/threadActivity.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/useFontFamily.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/useMobileNavigationTheme.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/useThemeColor.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/useUniwindTheme.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.ios.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.native.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/native/T3ComposerEditor.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-pr-presentation.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-pr.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-pr.ts— ownermobile(Native client and Marcode branding)apps/mobile/uniwind-types.d.ts— ownermobile(Native client and Marcode branding)apps/server/src/cloud/bootService.test.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/cloud/bootService.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/persistence/Migrations.ts— ownerpersistence(Shared migration registry; Marcode and upstream migrations must retain unique ordered ids)apps/server/src/provider/Drivers/ClaudeDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/CodexDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokDriver.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokSkills.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/GrokSkills.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeAdapter.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeCapabilitiesProbe.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ClaudeProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexAdapter.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexCollabRuntime.integration.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexCollabWire.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CodexSessionRuntime.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/CursorAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokAdapter.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/GrokProvider.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderInstanceRegistryLive.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderRegistry.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderService.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/ProviderService.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/ModelManifest.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/ModelManifest.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpJsonRpcConnection.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpRuntimeModel.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpRuntimeModel.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/AcpSessionRuntime.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpCliProbe.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpSupport.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/GrokAcpSupport.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/XAiAcpExtension.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/acp/XAiAcpExtension.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/model-manifest.json— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.cliParsers.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/testFixtures/codexCollabMockPeer.mjs— ownerprovider-runtime(Provider-specific Marcode behavior)apps/web/src/components/ChatView.tsx— ownerweb-runtime(Marcode workspace, terminal, and browser integration)apps/web/src/components/Sidebar.logic.test.ts— ownerweb-navigation(Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.logic.ts— ownerweb-navigation(Shared legacy, unified-workspace, and sidebar-v2 behavior)apps/web/src/components/Sidebar.tsx— ownerweb-navigation(Marcode unified project workspace and thread navigation)apps/web/src/components/chat/ChatComposer.tsx— ownerweb-shell(Marcode floating glass composer)apps/web/src/components/sidebar/SidebarChrome.tsx— ownerweb-navigation(Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)apps/web/src/index.css— ownerdesign-system(Marcode visual tokens and chrome)assets/README.md— ownerrelease-branding(Release channel and product assets)packages/contracts/src/settings.test.ts— ownerweb-navigation(Marcode navigation and unified-workspace rollout settings)packages/contracts/src/settings.ts— ownerweb-navigation(Marcode navigation and unified-workspace rollout settings)Reproduce locally (read-only, disposable worktree)
The bot did not resolve conflicts, did not push an integration branch, and did not open a
pull request. Resolve this by hand: see docs/operations/upstream-sync.md.