upstream sync blocked: pingdotgg/t3code@05d404210058 #85

Automatic upstream detection reached conflicted and stopped before any mutation.

Conflicting paths

• .devcontainer/devcontainer.json
• apps/desktop/resources/dmg/dmg-background-latest.svg
• apps/desktop/resources/dmg/dmg-background-nightly.svg
• apps/desktop/scripts/electron-launcher.mjs
• apps/desktop/scripts/electron-launcher.test.mjs
• apps/desktop/src/app/DesktopEnvironment.test.ts
• apps/desktop/src/app/DesktopEnvironment.ts
• apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
• apps/desktop/src/electron/ElectronProtocol.ts
• apps/desktop/src/window/DesktopWindow.test.ts
• apps/marketing/src/pages/95.astro
• apps/mobile/app.config.ts
• apps/mobile/src/features/settings/SettingsRouteScreen.tsx
• apps/mobile/src/lib/mobileTheme.ts
• apps/server/scripts/marcode-sqlite-state.ts
• apps/server/src/cloud/publicConfig.ts
• apps/server/src/environment/ServerEnvironment.test.ts
• apps/server/src/environment/ServerEnvironment.ts
• apps/server/src/persistence/Migrations.ts
• apps/server/src/project/AgentSessionScanner.test.ts
• apps/server/src/provider/Layers/ClaudeAdapter.test.ts
• apps/server/src/provider/Layers/codexLaunchArgs.ts
• apps/server/src/provider/RuntimeInstructions.ts
• apps/server/src/workspace/WorkspaceFileSystem.ts
• apps/web/src/components/ChatView.tsx
• apps/web/src/components/RightPanelTabs.tsx
• apps/web/src/components/ThreadTerminalDrawer.tsx
• apps/web/src/components/chat/MessagesTimeline.test.tsx
• apps/web/src/components/chat/OpenInPicker.tsx
• apps/web/src/components/clerk/MobileClientsUserProfilePage.logic.ts
• apps/web/src/components/cloud/ConnectOnboardingDialog.tsx
• apps/web/src/components/onboarding/WelcomeWizard.tsx
• apps/web/src/components/pullRequest/PullRequestDetailPanel.tsx
• apps/web/src/components/settings/SettingsSidebarNav.tsx
• apps/web/src/hooks/useTheme.test.ts
• apps/web/src/hooks/useTheme.ts
• apps/web/src/index.css
• apps/web/src/rightPanelStore.ts
• docs/user/welcome-wizard.md
• package.json
• packages/contracts/src/environment.ts
• packages/contracts/src/project.ts
• packages/contracts/src/settings.test.ts
• packages/contracts/src/settings.ts
• packages/shared/src/git.test.ts
• pnpm-lock.yaml
• scripts/build-desktop-artifact.test.ts
• scripts/build-desktop-artifact.ts
• scripts/package.json

Hotspot matches

• apps/desktop/resources/dmg/dmg-background-latest.svg — owner release-branding (Marcode desktop branding)
• apps/desktop/resources/dmg/dmg-background-nightly.svg — owner release-branding (Marcode desktop branding)
• apps/marketing/package.json — owner marketing (Marcode public site and assets)
• apps/marketing/src/lib/homeMotion.test.ts — owner marketing (Marcode public site and assets)
• apps/marketing/src/lib/homeMotion.ts — owner marketing (Marcode public site and assets)
• apps/marketing/src/lib/site.ts — owner marketing (Marcode public site and assets)
• apps/marketing/src/pages/95.astro — owner marketing (Marcode public site and assets)
• apps/marketing/src/pages/index.astro — owner marketing (Marcode public site and assets)
• apps/marketing/vercel.ts — owner marketing (Marcode public site and assets)
• apps/mobile/app.config.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/assets/android-icon-background-dev.png — owner mobile (Native client and Marcode branding)
• apps/mobile/assets/android-icon-background-nightly.png — 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/assets/android-splash-icon-dev.png — owner mobile (Native client and Marcode branding)
• apps/mobile/assets/android-splash-icon-nightly.png — owner mobile (Native client and Marcode branding)
• apps/mobile/assets/android-splash-icon-prod.png — 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-themes.css — owner mobile (Native client and Marcode branding)
• apps/mobile/global.css — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/android/build.gradle — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/android/src/main/AndroidManifest.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/AgentNotifications.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/android/src/main/java/expo/modules/t3agentnotifications/T3AgentNotificationsModule.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/android/src/test/java/expo/modules/t3agentnotifications/AgentNotificationsTest.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-agent-notifications/expo-module.config.json — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/android/src/main/java/expo/modules/t3markdowntext/T3MarkdownTextSelectionModule.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/package.json — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/NativeMarkdownSelectableText.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-review-diff/ios/T3ReviewDiffView.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/package.json — 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/ComposerAttachmentButton.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/GlassBackdrop.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/MediaVideoPlayer.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/ProviderIcon.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/ThemedSwitch.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/migration.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/androidNotifications.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/androidNotifications.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/capabilities.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/notificationPermissions.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/notificationPermissions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/notificationResponseConsumer.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/registrationPayload.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/remoteRegistration.ts — 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/archive/archivedThreadList.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/cloud-drafts.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/managedRelayTokenStore.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/cloud/publicConfig.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/connection/pairing.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/diffs/nativeReviewDiffHighlighter.ts — 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/HomeHeader.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/HomeRouteScreen.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/homeListItems.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/homeThreadList.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/homeThreadList.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/thread-dismissal.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/thread-dismissal.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/thread-swipe-actions.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/home/useThreadListActions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/keyboard/HardwareKeyboardCommandProvider.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/layout/AdaptiveWorkspaceLayout.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-content-width.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/layout/workspace-inspector-pane.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/shikiReviewHighlighter.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/settings/SettingsRouteScreen.logic.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/settings/SettingsRouteScreen.logic.ts — 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/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/components/SettingsSwitchRow.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/sharing/incoming-share-storage.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/terminal/terminalTheme.ts — 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/NewTaskDraftRouteScreen.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/PendingUserInputCard.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/QuestionAnswerHistory.test.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/QuestionAnswerHistory.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/QuestionAttachments.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadArrangementSheet.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/ThreadCreationFailedCard.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ThreadDetailScreen.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/ThreadRouteScreen.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/checkout-new-task-branch.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/checkout-new-task-branch.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/floating-working-control.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/floating-working-status.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/floating-working-status.ts — 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/new-task-flow-provider.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/pending-thread-feed.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/pending-thread-feed.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/projectThreadCreationValidation.ts — 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-provider-instance.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/thread-provider-instance.ts — 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/threadDragGap.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/threadDragGap.ts — 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/threadOrder.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/threads/use-project-actions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/use-thread-settings-sheet-presentation.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/usage/UsageLimitsPooled.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/usage/UsageLimitsSection.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/usage/UsageRouteScreen.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/composerAttachmentUploadQueue.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/copyTextWithHaptic.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/glassBlurTarget.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/http-response.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/materialYouPalette.android.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/materialYouPalette.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/materialYouTheme.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/materialYouTheme.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.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/openExternalUrl.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/projectThreadStartTurn.test.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/useUniwindTheme.ts — 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/nativeViewResolutionError.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-database.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-preferences.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-secure-storage.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/persistence/mobile-storage.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/acknowledged-thread-messages.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/edit-pending-thread-message.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/edit-pending-thread-message.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/new-task-draft-key.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/pending-thread-creation.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/pending-thread-creation.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/question-attachments.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/recover-failed-thread-draft.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-order.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox-manager.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/thread-outbox-storage.ts — 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-composer-drafts.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-selected-thread-git-actions.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-selected-thread-requests.test.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-selected-thread-requests.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-composer-state.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-detail.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-outbox-drain.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-thread-outbox-drain.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/src/state/use-thread-selection.ts — owner mobile (Native client and Marcode branding)
• apps/server/src/cli/app.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/config.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/pair.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/project.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/servicePreflight.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/theme.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cli/triage.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)
• apps/server/src/cloud/CliTokenManager.test.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/CliTokenManager.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/ManagedEndpointRuntime.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/cloud/pinnedRuntime.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/publicConfig.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/serviceLauncherClient.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)
• apps/server/src/cloud/serviceProtocol.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/AntigravityInstallation.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/ClaudeModelCatalog.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexDeveloperInstructions.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/AntigravityDriver.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/AntigravitySkills.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/ClaudeSkills.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/CodexHomeLayout.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/CursorSkills.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/Errors.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/AntigravityAdapter.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/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/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.test.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/EventNdjsonLogger.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/OpenCodeAdapter.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderAdapterRegistry.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderEventLoggers.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderInstanceRegistryLive.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/Layers/ProviderSessionReaper.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderSessionReaper.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/codexLaunchArgs.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/codexResetCredit.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/codexUsageLimits.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/codexUsageLimits.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/OpenCodeServerOwner.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/RuntimeInstructions.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/RuntimeInstructions.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/AntigravityAcpSupport.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/AntigravityProtocol.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/CursorTransportFailure.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/acp/CursorTransportFailure.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/antigravityRelease.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/providerMaintenance.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerMaintenanceRunner.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerSnapshot.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerUpdateSettings.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/testUtils/providerRegistryMock.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/userInputAttachments.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/userInputAttachments.ts — 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/CommandPalette.tsx — owner web-navigation (Marcode floating-pill entry point plus upstream command-palette intents)
• 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/chat/ChatHeader.tsx — owner web-shell (Marcode portals thread actions into FloatingPillNav)
• apps/web/src/hooks/useHandleNewThread.ts — owner web-runtime (Unified-workspace placement and upstream draft carry-forward behavior)
• apps/web/src/hooks/useTheme.test.ts — owner web-shell (Marcode intentionally keeps the onboarding wizard dark while retaining upstream theme plumbing)
• apps/web/src/hooks/useTheme.ts — owner web-shell (Marcode intentionally keeps the onboarding wizard dark while retaining upstream theme plumbing)
• apps/web/src/index.css — owner design-system (Marcode visual tokens and chrome)
• apps/web/src/rightPanelStore.ts — owner web-runtime (Marcode multi-surface state)
• 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)

vp run upstream:plan

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.