upstream sync blocked: pingdotgg/t3code@6ea01f8d2441

[github-actions]

Automatic upstream detection reached conflicted and stopped before any mutation.

field	value
target main	bc516ec85e823ebe4013ad46c29e4af9cbf37b0e
source main	6ea01f8d24419019588f2be589681929d8e26b0c
merge base	d15210cd3da79f9a1a495a6309d912d76362a046
upstream commits	65
changed paths	405

Conflicting paths

• .github/workflows/ci.yml
• .github/workflows/release.yml
• AGENTS.md
• apps/desktop/src/app/DesktopLinuxUrlHandler.test.ts
• apps/desktop/src/app/DesktopPreReadyPlatform.test.ts
• apps/desktop/src/preview/Manager.test.ts
• apps/marketing/src/layouts/Layout.astro
• apps/mobile/app.config.ts
• apps/mobile/src/features/agent-awareness/remoteRegistration.ts
• apps/server/src/auth/RpcAuthorization.ts
• apps/server/src/provider/Layers/CodexProvider.ts
• apps/server/src/sourceControl/BitbucketApi.test.ts
• apps/server/src/sourceControl/BitbucketApi.ts
• apps/server/src/sourceControl/BitbucketSourceControlProvider.ts
• apps/server/src/sourceControl/SourceControlDiscovery.test.ts
• apps/web/src/components/chat/DraftHeroHeadline.tsx
• apps/web/src/components/clerk/MobileClientsUserProfilePage.tsx
• apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx
• apps/web/src/components/files/FilePreviewPanel.tsx
• apps/web/src/rightPanelStore.test.ts
• apps/web/src/rightPanelStore.ts
• docs/user/source-control.md
• packages/client-runtime/src/state/projectCommands.ts
• packages/contracts/src/pullRequest.ts
• packages/contracts/src/rpc.ts
• pnpm-lock.yaml
• scripts/mobile-showcase.ts
• third-party-licenses.config.json

Hotspot matches

• apps/marketing/src/assets/social-card.webp — owner marketing (Marcode public site and assets)
• apps/marketing/src/layouts/Layout.astro — owner marketing (Marcode public site and assets)
• apps/marketing/src/lib/site.ts — owner marketing (Marcode public site and assets)
• apps/mobile/app.config.ts — 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-composer-editor/ios/T3ComposerEditorModule.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/ios/T3MarkdownText.mm — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/ios/T3MarkdownTextManager.mm — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/ios/T3MarkdownTextRun.mm — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/MarkdownTextPrimitive.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/T3MarkdownTextNativeComponent.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/T3MarkdownTextRunNativeComponent.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-markdown-text/src/markdownFileIcons.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift — 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/modules/t3-subscription-widget/android/build.gradle — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/AndroidManifest.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/SubscriptionUsageWidget.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/java/expo/modules/t3subscriptionwidget/T3SubscriptionWidgetModule.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/drawable/t3_subscription_widget_background.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/layout/t3_subscription_widget_row.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/values-night/colors.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/colors.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/values/strings.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/android/src/main/res/xml/t3_subscription_widget_info.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-subscription-widget/expo-module.config.json — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-terminal/ios/T3TerminalView.swift — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/android/build.gradle — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/android/src/main/AndroidManifest.xml — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/android/src/main/java/expo/modules/t3widgetexpiry/T3WidgetExpiryModule.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/android/src/main/java/expo/modules/t3widgetexpiry/WidgetExpiryReceiver.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/android/src/test/java/expo/modules/t3widgetexpiry/WidgetExpiryReceiverTest.kt — owner mobile (Native client and Marcode branding)
• apps/mobile/modules/t3-widget-expiry/expo-module.config.json — owner mobile (Native client and Marcode branding)
• apps/mobile/package.json — owner mobile (Native client and Marcode branding)
• apps/mobile/plugins/withIosSceneLifecycle.cjs — owner mobile (Native client and Marcode branding)
• apps/mobile/plugins/withIosSceneLifecycle.test.mjs — owner mobile (Native client and Marcode branding)
• apps/mobile/src/App.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/Stack.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/AppText.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/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/MaterialSearchField.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/components/ScreenHeader.android.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/connection/background-activity.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/agentLiveActivity.ios.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/agentLiveActivity.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/foregroundNotificationBehavior.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/foregroundNotificationBehavior.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/notificationNavigation.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/agent-awareness/notificationPayload.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/connection/CloudEnvironmentRows.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/devices/DeviceStreamWebView.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/files/MaterialFilesHeader.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/MaterialThreadListToolbar.tsx — 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/keyboard/CommandPalette.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/projects/AddProjectNewRoute.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/sharing/incoming-share-storage.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/terminal/NativeTerminalSurface.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ChatGptSharingStatus.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/ChatGptUsageLimitNotice.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/features/threads/CustomSnoozeSheet.ios.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/ThreadComposer.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/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/new-task-flow-provider.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/usage/ChatGptUsageSummary.tsx — 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/atomic-file.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/attachmentUpload.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/lib/composerImages.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/native/T3KeyboardCommands.android.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/native/T3KeyboardCommands.ios.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/assets.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/projectClones.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/state/use-remote-environment-registry.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/AgentActivity.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/AgentActivity.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/SubscriptionUsage.android.test.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/SubscriptionUsage.android.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/SubscriptionUsage.tsx — owner mobile (Native client and Marcode branding)
• apps/mobile/src/widgets/publishSubscriptionUsage.android.ts — owner mobile (Native client and Marcode branding)
• apps/mobile/tsconfig.json — owner mobile (Native client and Marcode branding)
• apps/server/src/provider/CodexAuthCallback.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexAuthCallback.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexAuthCallbackPage.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptAuth.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptAuth.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptHandoff.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptModels.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptModels.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptSessionLock.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexChatGptSessionLock.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexInstallation.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexInstallation.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexManagedErrors.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexManagedErrors.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexManagedHome.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexManagedRuntime.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/CodexManagedRuntime.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Drivers/CodexDriver.test.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/CodexManagedProvider.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/AntigravityProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/AntigravityProvider.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/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.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/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/OpenCodeAdapter.test.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/OpenCodeProvider.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Layers/ProviderAuthService.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/ProviderRegistry.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/openCodeUsageLimits.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/ProviderAuthFlow.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/ProviderAuthFlow.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Services/ProviderAuthService.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/Services/ProviderRegistry.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/providerCompatibility.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerInstallation.test.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerInstallation.ts — owner provider-runtime (Provider-specific Marcode behavior)
• apps/server/src/provider/providerMaintenanceRunner.test.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/clerk/T3ConnectSidebarSignIn.tsx — owner product-identity (User-visible Marcode Connect identity)
• apps/web/src/components/files/FilePreviewPanel.test.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/FilePreviewPanel.tsx — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/components/files/filePreviewMode.ts — owner editor-runtime (Marcode retired the right-panel file surface; the floating editor owns file editing)
• apps/web/src/rightPanelStore.ts — owner web-runtime (Marcode multi-surface state)
• packages/client-runtime/src/operations/projects.ts — owner web-runtime (Project mutation operations shared with Marcode workspace layout)
• 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.