Automatic upstream detection reached conflicted and stopped before any mutation.
| field | value |
|---|
target main | 1af3478a59c99de26d5ff7268a519dff3ffa72ba |
source main | ad117235b544e23545fe39143812db2ddd41af1f |
| merge base | b73232bdd31e83914a8a943960c7dc4b6390b39b |
| upstream commits | 147 |
| changed paths | 573 |
Conflicting paths
.agents/skills/test-t3-mobile/SKILL.mdAGENTS.mdREADME.mdapps/desktop/resources/icon.icnsapps/desktop/resources/icon.icoapps/desktop/resources/icon.pngapps/desktop/scripts/electron-launcher.mjsapps/desktop/src/window/DesktopWindow.test.tsapps/server/src/sourceControl/BitbucketSourceControlProvider.tsapps/web/src/components/AppSidebarLayout.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/OpenInPicker.tsxapps/web/src/components/clerk/MobileClientsUserProfilePage.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/pullRequest/PullRequestCodeTab.tsxapps/web/src/components/pullRequest/PullRequestDetailPanel.tsxapps/web/src/components/pullRequest/PullRequestTimelineTab.tsxapps/web/src/components/settings/ConnectionsSettings.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/threadSidebarWidth.test.tsapps/web/src/components/ui/tooltip.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/diffFileActions.test.tsapps/web/src/diffFileActions.tsapps/web/src/hooks/useHandleNewThread.tsapps/web/src/index.cssapps/web/src/routes/_chat.pull-requests.tsxdocs/internals/scripts.mdpackages/client-runtime/src/state/threadSettled.tspnpm-lock.yamlscripts/build-desktop-artifact.ts
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/desktop/resources/icon.icns — owner release-branding (Marcode desktop branding)apps/desktop/resources/icon.ico — owner release-branding (Marcode desktop branding)apps/desktop/resources/icon.png — owner release-branding (Marcode desktop branding)apps/marketing/src/lib/macArch.test.ts — owner marketing (Marcode public site and assets)apps/marketing/src/lib/macArch.ts — owner marketing (Marcode public site and assets)apps/marketing/src/pages/index.astro — owner marketing (Marcode public site and assets)apps/mobile/app.config.ts — owner mobile (Native client and Marcode branding)apps/mobile/global.css — 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-composer-editor/ios/T3ComposerEditorView.swift — 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/SelectableMarkdownText.ios.tsx — owner mobile (Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts — owner mobile (Native client and Marcode branding)apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt — owner mobile (Native client and Marcode branding)apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt — owner mobile (Native client and Marcode branding)apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift — 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/src/Stack.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/GlassSurface.tsx — 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/connection/ConnectionsNewRouteScreen.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/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/layout/native-mail-search-toolbar.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectDestinationRoute.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/ReviewSheet.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/settings/SettingsAuthRouteScreen.tsx — 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/components/SettingsSwitchRow.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/features/sharing/incoming-share-model.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/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/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/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/legacy-plan-mode.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/legacy-plan-mode.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/new-task-context-presentation.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/new-task-context-presentation.ts — 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/new-task-project-selection.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/new-task-project-selection.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/projectThreadCreationValidation.test.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/sidebar-header-actions.android.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-settings-menu.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-menu.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-options.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-options.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-sheet-state.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/use-legacy-plan-mode-enabled.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/updates/app-updates.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/features/updates/app-updates.ts — 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/composerImages.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/foreground-handoff.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/foreground-handoff.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/layoutMetrics.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/lib/nativeMarkdownText.test.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/T3HeaderButton.android.tsx — owner mobile (Native client and Marcode branding)apps/mobile/src/native/composerEditorRevision.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/native/composerEditorRevision.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/native/native-glass.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/native/sheet-surface.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/state/queries.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/thread-outbox-model.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-outbox.test.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/thread-outbox.ts — owner mobile (Native client and Marcode branding)apps/mobile/src/state/use-composer-drafts.test.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-thread-composer-state.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/server/src/cli/connect.ts — owner server-runtime (Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/config.ts — owner server-runtime (Background service lifecycle and user-visible Marcode server identity)apps/server/src/provider/CodexDeveloperInstructions.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/server/src/provider/Drivers/ClaudeSkills.test.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/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/CodexSessionRuntime.test.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/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/opencodeRuntime.environment.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/providerMaintenance.test.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/providerSnapshot.ts — owner provider-runtime (Provider-specific Marcode behavior)apps/web/public/manifest.webmanifest — owner release-branding (Marcode web marks and favicon assets)apps/web/src/components/AppSidebarLayout.tsx — owner web-navigation (Marcode floating navigation shell and upstream sidebar selection)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/components/clerk/T3ConnectSidebarSignIn.tsx — owner product-identity (User-visible Marcode Connect identity)apps/web/src/components/files/FileBrowserPanel.tsx — 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/sidebar/SidebarChrome.tsx — owner web-navigation (Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)apps/web/src/components/ui/alert-dialog.tsx — owner web-shell (Shared Marcode portal overlay and backdrop behavior)apps/web/src/components/ui/menu.tsx — owner web-shell (Shared Marcode portal overlay and floating-layer behavior)apps/web/src/components/ui/popover.tsx — owner web-shell (Shared Marcode portal overlay and floating-layer behavior)apps/web/src/hooks/useHandleNewThread.ts — owner web-runtime (Unified-workspace placement and upstream draft carry-forward behavior)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)packages/client-runtime/src/operations/projects.test.ts — owner web-runtime (Project mutation operations shared with Marcode workspace layout)packages/client-runtime/src/operations/projects.ts — owner web-runtime (Project mutation operations shared with Marcode workspace layout)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.main1af3478a59c99de26d5ff7268a519dff3ffa72bamainad117235b544e23545fe39143812db2ddd41af1fb73232bdd31e83914a8a943960c7dc4b6390b39bConflicting paths
.agents/skills/test-t3-mobile/SKILL.mdAGENTS.mdREADME.mdapps/desktop/resources/icon.icnsapps/desktop/resources/icon.icoapps/desktop/resources/icon.pngapps/desktop/scripts/electron-launcher.mjsapps/desktop/src/window/DesktopWindow.test.tsapps/server/src/sourceControl/BitbucketSourceControlProvider.tsapps/web/src/components/AppSidebarLayout.tsxapps/web/src/components/ChatMarkdown.tsxapps/web/src/components/ChatView.tsxapps/web/src/components/RightPanelTabs.tsxapps/web/src/components/ThreadTerminalDrawer.tsxapps/web/src/components/chat/ChatHeader.tsxapps/web/src/components/chat/OpenInPicker.tsxapps/web/src/components/clerk/MobileClientsUserProfilePage.tsxapps/web/src/components/files/FileBrowserPanel.tsxapps/web/src/components/files/FilePreviewPanel.tsxapps/web/src/components/pullRequest/PullRequestCodeTab.tsxapps/web/src/components/pullRequest/PullRequestDetailPanel.tsxapps/web/src/components/pullRequest/PullRequestTimelineTab.tsxapps/web/src/components/settings/ConnectionsSettings.tsxapps/web/src/components/sidebar/SidebarChrome.tsxapps/web/src/components/threadSidebarWidth.test.tsapps/web/src/components/ui/tooltip.tsxapps/web/src/components/usage/UsagePage.tsxapps/web/src/diffFileActions.test.tsapps/web/src/diffFileActions.tsapps/web/src/hooks/useHandleNewThread.tsapps/web/src/index.cssapps/web/src/routes/_chat.pull-requests.tsxdocs/internals/scripts.mdpackages/client-runtime/src/state/threadSettled.tspnpm-lock.yamlscripts/build-desktop-artifact.tsHotspot matches
apps/desktop/resources/dmg/dmg-background-latest.svg— ownerrelease-branding(Marcode desktop branding)apps/desktop/resources/dmg/dmg-background-nightly.svg— ownerrelease-branding(Marcode desktop branding)apps/desktop/resources/icon.icns— ownerrelease-branding(Marcode desktop branding)apps/desktop/resources/icon.ico— ownerrelease-branding(Marcode desktop branding)apps/desktop/resources/icon.png— ownerrelease-branding(Marcode desktop branding)apps/marketing/src/lib/macArch.test.ts— ownermarketing(Marcode public site and assets)apps/marketing/src/lib/macArch.ts— ownermarketing(Marcode public site and assets)apps/marketing/src/pages/index.astro— ownermarketing(Marcode public site and assets)apps/mobile/app.config.ts— ownermobile(Native client and Marcode branding)apps/mobile/global.css— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-composer-editor/android/src/main/java/expo/modules/t3composereditor/T3ComposerEditorView.kt— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-composer-editor/ios/T3ComposerEditorView.swift— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/NativeMarkdownBlock.ios.tsx— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/SelectableMarkdownText.ios.tsx— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-markdown-text/src/nativeMarkdownText.ts— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3HeaderButtonView.kt— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-native-controls/android/src/main/java/expo/modules/t3nativecontrols/T3NativeControlsModule.kt— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-native-controls/ios/T3HeaderButtonView.swift— ownermobile(Native client and Marcode branding)apps/mobile/modules/t3-native-controls/ios/T3NativeControlsModule.swift— ownermobile(Native client and Marcode branding)apps/mobile/src/Stack.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/ComposerToolbar.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/components/GlassSurface.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/agent-awareness/remoteRegistration.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/agent-awareness/remoteRegistration.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/connection/ConnectionsNewRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/files/FileTreeBrowser.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/HomeRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/home/HomeScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/layout/native-mail-search-toolbar.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/projects/AddProjectDestinationRoute.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/ReviewSheet.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsAuthRouteScreen.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.logic.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.logic.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/settings/SettingsRouteScreen.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/sharing/incoming-share-model.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/terminal/ThreadTerminalRouteScreen.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/ThreadComposer.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/ThreadDetailScreen.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/ThreadRouteScreen.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/legacy-plan-mode.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/legacy-plan-mode.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/new-task-context-presentation.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/new-task-context-presentation.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/new-task-flow-provider.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/new-task-project-selection.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/new-task-project-selection.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/projectThreadCreationValidation.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/projectThreadCreationValidation.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/sidebar-header-actions.android.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-settings-menu.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-menu.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-options.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-options.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-sheet-state.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/thread-settings-sheet-state.ts— 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/use-legacy-plan-mode-enabled.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/threads/use-thread-settings-sheet-presentation.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/updates/app-updates.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/features/updates/app-updates.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/atomic-file.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/composerImages.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/foreground-handoff.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/foreground-handoff.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/layoutMetrics.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/lib/nativeMarkdownText.test.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/T3HeaderButton.android.tsx— ownermobile(Native client and Marcode branding)apps/mobile/src/native/composerEditorRevision.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/native/composerEditorRevision.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/native/native-glass.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/native/sheet-surface.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/persistence/mobile-preferences.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/queries.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox-model.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox-storage.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/thread-outbox.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-composer-drafts.test.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-composer-drafts.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-composer-state.ts— ownermobile(Native client and Marcode branding)apps/mobile/src/state/use-thread-outbox-drain.ts— ownermobile(Native client and Marcode branding)apps/server/src/cli/connect.ts— ownerserver-runtime(Compatibility CLI behavior with user-visible Marcode service identity)apps/server/src/cloud/config.ts— ownerserver-runtime(Background service lifecycle and user-visible Marcode server identity)apps/server/src/provider/CodexDeveloperInstructions.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/ClaudeSkills.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Drivers/ClaudeSkills.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/CodexSessionRuntime.test.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.test.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/OpenCodeAdapter.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/Layers/OpenCodeAdapter.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.environment.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/opencodeRuntime.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/providerMaintenance.test.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/providerMaintenance.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/server/src/provider/providerSnapshot.ts— ownerprovider-runtime(Provider-specific Marcode behavior)apps/web/public/manifest.webmanifest— ownerrelease-branding(Marcode web marks and favicon assets)apps/web/src/components/AppSidebarLayout.tsx— ownerweb-navigation(Marcode floating navigation shell and upstream sidebar selection)apps/web/src/components/ChatView.tsx— ownerweb-runtime(Marcode workspace, terminal, and browser integration)apps/web/src/components/CommandPalette.tsx— ownerweb-navigation(Marcode floating-pill entry point plus upstream command-palette intents)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/chat/ChatHeader.tsx— ownerweb-shell(Marcode portals thread actions into FloatingPillNav)apps/web/src/components/clerk/T3ConnectSidebarSignIn.tsx— ownerproduct-identity(User-visible Marcode Connect identity)apps/web/src/components/files/FileBrowserPanel.tsx— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/files/FilePreviewPanel.tsx— ownereditor-runtime(Marcode retired the right-panel file surface; the floating editor owns file editing)apps/web/src/components/sidebar/SidebarChrome.tsx— ownerweb-navigation(Marcode keeps brand, settings, and sidebar controls in FloatingPillNav)apps/web/src/components/ui/alert-dialog.tsx— ownerweb-shell(Shared Marcode portal overlay and backdrop behavior)apps/web/src/components/ui/menu.tsx— ownerweb-shell(Shared Marcode portal overlay and floating-layer behavior)apps/web/src/components/ui/popover.tsx— ownerweb-shell(Shared Marcode portal overlay and floating-layer behavior)apps/web/src/hooks/useHandleNewThread.ts— ownerweb-runtime(Unified-workspace placement and upstream draft carry-forward behavior)apps/web/src/index.css— ownerdesign-system(Marcode visual tokens and chrome)apps/web/src/rightPanelStore.ts— ownerweb-runtime(Marcode multi-surface state)packages/client-runtime/src/operations/projects.test.ts— ownerweb-runtime(Project mutation operations shared with Marcode workspace layout)packages/client-runtime/src/operations/projects.ts— ownerweb-runtime(Project mutation operations shared with Marcode workspace layout)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.